third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.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/graphics/ImageFrameGenerator.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/graphics/GraphicsLayerDebugInfo.h ('k') | third_party/WebKit/Source/platform/graphics/filters/FilterOperation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp

index 806350a5e2556e6f898caba4346c80f5bf062b8e..edb8bf46bced153c514a85e3e89ff9780f738f25 100644

--- a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp

+++ b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp

@@ -363,13 +363,13 @@ bool ImageFrameGenerator::decode(size_t index, ImageDecoder** decoder, SkBitmap*

(*decoder)->clearCacheExceptFrame(index);

(*decoder)->setMemoryAllocator(0);

- if (!frame || frame->status() == ImageFrame::FrameEmpty)

+ if (!frame || frame->getStatus() == ImageFrame::FrameEmpty)

return false;

// A cache object is considered complete if we can decode a complete frame.

// Or we have received all data. The image might not be fully decoded in

// the latter case.

- const bool isDecodeComplete = frame->status() == ImageFrame::FrameComplete || allDataReceived;

+ const bool isDecodeComplete = frame->getStatus() == ImageFrame::FrameComplete || allDataReceived;

SkBitmap fullSizeBitmap = frame->getSkBitmap();

if (!fullSizeBitmap.isNull()) {