third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.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/jpeg/JPEGImageDecoder.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/ico/ICOImageDecoder.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b940a89422b145bc6945c61eb426658016c51d68..a423aabab93b2cc3fad4de5811033fbdc425ecef 100644

--- a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

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

@@ -995,7 +995,7 @@ bool JPEGImageDecoder::outputScanlines()

// Initialize the framebuffer if needed.

ImageFrame& buffer = m_frameBufferCache[0];

- if (buffer.status() == ImageFrame::FrameEmpty) {

+ if (buffer.getStatus() == ImageFrame::FrameEmpty) {

ASSERT(info->output_width == static_cast<JDIMENSION>(m_decodedSize.width()));

ASSERT(info->output_height == static_cast<JDIMENSION>(m_decodedSize.height()));