third_party/WebKit/Source/platform/Cursor.h - Issue 1774943003: blink: Rename platform/ methods 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/platform/Cursor.h

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

Patch Set: clash-platform: rebase-yayyyyyyyy 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/webgl/WebGLRenderingContextBase.cpp ('k') | third_party/WebKit/Source/platform/DragImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/Cursor.h

diff --git a/third_party/WebKit/Source/platform/Cursor.h b/third_party/WebKit/Source/platform/Cursor.h

index f37fe6e81d4df08e29f04af904f449806a7299e8..00ef3d7eadf2b78936ffc93ec8d0088c2ad624aa 100644

--- a/third_party/WebKit/Source/platform/Cursor.h

+++ b/third_party/WebKit/Source/platform/Cursor.h

@@ -105,7 +105,7 @@ public:

ASSERT(m_type >= 0 && m_type <= Custom);

return m_type;

}

- Image* image() const { return m_image.get(); }

+ Image* getImage() const { return m_image.get(); }

const IntPoint& hotSpot() const { return m_hotSpot; }

// Image scale in image pixels per logical (UI) pixel.

float imageScaleFactor() const { return m_imageScaleFactor; }