third_party/WebKit/Source/core/layout/FloatingObjects.h - Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/.

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/core/layout/FloatingObjects.h

Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-6

Patch Set: get-names-7: rebase 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/core/editing/iterators/TextIterator.cpp ('k') | third_party/WebKit/Source/core/layout/FloatingObjects.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/FloatingObjects.h

diff --git a/third_party/WebKit/Source/core/layout/FloatingObjects.h b/third_party/WebKit/Source/core/layout/FloatingObjects.h

index a7ff1f60c6a66a6b0287815ecbd099bcb3731c3a..e465f4043140bbad667f5f0069c6091768a8c6cc 100644

--- a/third_party/WebKit/Source/core/layout/FloatingObjects.h

+++ b/third_party/WebKit/Source/core/layout/FloatingObjects.h

@@ -52,7 +52,7 @@ public:

PassOwnPtr<FloatingObject> unsafeClone() const;

- Type type() const { return static_cast<Type>(m_type); }

+ Type getType() const { return static_cast<Type>(m_type); }

LayoutBox* layoutObject() const { return m_layoutObject; }

bool isPlaced() const { return m_isPlaced; }