third_party/WebKit/Source/modules/canvas2d/CanvasStyle.h - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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/modules/canvas2d/CanvasStyle.h

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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/modules/canvas2d/CanvasPattern.cpp ('k') | third_party/WebKit/Source/modules/canvas2d/CanvasStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/canvas2d/CanvasStyle.h

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasStyle.h b/third_party/WebKit/Source/modules/canvas2d/CanvasStyle.h

index 742e2706272c6968636fd5c1b73db09a4202a5d5..02923de261e0b797aa6490de60e86a436b1de2b5 100644

--- a/third_party/WebKit/Source/modules/canvas2d/CanvasStyle.h

+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasStyle.h

@@ -49,8 +49,8 @@ public:

static CanvasStyle* createFromPattern(CanvasPattern*);

String color() const { ASSERT(m_type == ColorRGBA); return Color(m_rgba).serialized(); }

- CanvasGradient* canvasGradient() const { return m_gradient.get(); }

- CanvasPattern* canvasPattern() const { return m_pattern; }

+ CanvasGradient* getCanvasGradient() const { return m_gradient.get(); }

+ CanvasPattern* getCanvasPattern() const { return m_pattern; }

void applyToPaint(SkPaint&) const;

RGBA32 paintColor() const;