third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp - Issue 1746283002: Rename enums/functions that collide in chromium style in platform/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get-names-13-platform: . Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp

diff --git a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp

index 4e039549b336653befb59e5034999e416304cb6f..8b86f0ebc5592da43d11cf715845e321781e949a 100644

--- a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp

+++ b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp

@@ -43,7 +43,7 @@ TEST(BMPImageDecoderTest, parseAndDecode)

ImageFrame* frame = decoder->frameBufferAtIndex(0);

ASSERT_TRUE(frame);

- EXPECT_EQ(ImageFrame::FrameComplete, frame->status());

+ EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus());

EXPECT_EQ(256, frame->getSkBitmap().width());

EXPECT_EQ(256, frame->getSkBitmap().height());

EXPECT_FALSE(decoder->failed());

@@ -61,7 +61,7 @@ TEST(BMPImageDecoderTest, emptyImage)

ImageFrame* frame = decoder->frameBufferAtIndex(0);

ASSERT_TRUE(frame);

- EXPECT_EQ(ImageFrame::FrameEmpty, frame->status());

+ EXPECT_EQ(ImageFrame::FrameEmpty, frame->getStatus());

EXPECT_TRUE(decoder->failed());

}