third_party/WebKit/Source/core/layout/line/InlineTextBox.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/line/InlineTextBox.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/layout/line/InlineIterator.h ('k') | third_party/WebKit/Source/core/layout/line/InlineTextBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/line/InlineTextBox.h

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

index 0711e25df20fb1676dbec6fca467ae83919f6897..d26ebedea6c461f97a2c0b88215bce56ef4d8356 100644

--- a/third_party/WebKit/Source/core/layout/line/InlineTextBox.h

+++ b/third_party/WebKit/Source/core/layout/line/InlineTextBox.h

@@ -51,7 +51,7 @@ public:

setIsText(true);

}

- LineLayoutText lineLayoutItem() const { return LineLayoutText(InlineBox::lineLayoutItem()); }

+ LineLayoutText getLineLayoutItem() const { return LineLayoutText(InlineBox::getLineLayoutItem()); }

void destroy() final;

@@ -125,7 +125,7 @@ private:

void attachLine() final;

public:

- SelectionState selectionState() const final;

+ SelectionState getSelectionState() const final;

bool hasWrappedSelectionNewline() const;

float newlineSpaceWidth() const;