third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.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/ImageDecoderTestHelpers.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/ImageDecoderTest.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/ImageFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 543f754e7d5824086371ec0f82c72453424c6feb..c6e3e435041a11de0dc82b1160f22d82ecd91f8f 100644

--- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp

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

@@ -87,7 +87,7 @@ void testByteByByteDecode(DecoderCreator createDecoder, const char* file, size_t

continue;

ImageFrame* frame = decoder->frameBufferAtIndex(frameCount - 1);

- if (frame && frame->status() == ImageFrame::FrameComplete && framesDecoded < frameCount)

+ if (frame && frame->getStatus() == ImageFrame::FrameComplete && framesDecoded < frameCount)

++framesDecoded;

}

@@ -134,7 +134,7 @@ void testMergeBuffer(DecoderCreator createDecoder, const char* file)

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

ASSERT_FALSE(decoder->failed());

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

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

EXPECT_EQ(hashBitmap(frame->bitmap()), hash);

}