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

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

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

index dc5ee509a25327d43ec66481b22cf36ae1dda3a3..c21e161ab8ad03754583bc15a9ebdb410d580b11 100644

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

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

@@ -225,7 +225,7 @@ TEST(ImageDecoderTest, clearCacheExceptFrameAll)

for (size_t i = 0; i < numFrames; ++i) {

SCOPED_TRACE(testing::Message() << i);

- EXPECT_EQ(ImageFrame::FrameEmpty, frameBuffers[i].status());

+ EXPECT_EQ(ImageFrame::FrameEmpty, frameBuffers[i].getStatus());

}

@@ -243,9 +243,9 @@ TEST(ImageDecoderTest, clearCacheExceptFramePreverveClearExceptFrame)

for (size_t i = 0; i < numFrames; ++i) {

SCOPED_TRACE(testing::Message() << i);

if (i == 5)

- EXPECT_EQ(ImageFrame::FrameComplete, frameBuffers[i].status());

+ EXPECT_EQ(ImageFrame::FrameComplete, frameBuffers[i].getStatus());

else

- EXPECT_EQ(ImageFrame::FrameEmpty, frameBuffers[i].status());

+ EXPECT_EQ(ImageFrame::FrameEmpty, frameBuffers[i].getStatus());

}