third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.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/DeferredImageDecoder.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/fonts/shaping/HarfBuzzShaper.cpp ('k') | third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 1411c494248a4a21170f245dc5e8aaa5899035ae..03ca9b2cef22c4cae1967c003bca17facf5ec44b 100644

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

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

@@ -102,7 +102,7 @@ PassRefPtr<SkImage> DeferredImageDecoder::createFrameAtIndex(size_t index)

return nullptr;

ImageFrame* frame = m_actualDecoder->frameBufferAtIndex(index);

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

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

return nullptr;

return adoptRef(SkImage::NewFromBitmap(frame->bitmap()));