third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h - 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/gif/GIFImageReader.h

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

Index: third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h

diff --git a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h

index 18170f5ff537b9f497a02859ac11b30ca506c760..42234e7ad6a4814de4f942c18534b5ee0952546f 100644

--- a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h

+++ b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.h

@@ -229,7 +229,7 @@ public:

unsigned height() const { return m_height; }

size_t transparentPixel() const { return m_transparentPixel; }

void setTransparentPixel(size_t pixel) { m_transparentPixel = pixel; }

- blink::ImageFrame::DisposalMethod disposalMethod() const { return m_disposalMethod; }

+ blink::ImageFrame::DisposalMethod getDisposalMethod() const { return m_disposalMethod; }

void setDisposalMethod(blink::ImageFrame::DisposalMethod disposalMethod) { m_disposalMethod = disposalMethod; }

unsigned delayTime() const { return m_delayTime; }

void setDelayTime(unsigned delay) { m_delayTime = delay; }