third_party/WebKit/Source/core/layout/line/LineBreaker.cpp - 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/LineBreaker.cpp

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

Index: third_party/WebKit/Source/core/layout/line/LineBreaker.cpp

diff --git a/third_party/WebKit/Source/core/layout/line/LineBreaker.cpp b/third_party/WebKit/Source/core/layout/line/LineBreaker.cpp

index 952ca52a73143dcd2c8dd0476ffbaa691cf0c8cf..4f28f9b24d1a71b2b626a5b0ac0537addd986b12 100644

--- a/third_party/WebKit/Source/core/layout/line/LineBreaker.cpp

+++ b/third_party/WebKit/Source/core/layout/line/LineBreaker.cpp

@@ -30,7 +30,7 @@ void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo&

FloatingObject* lastFloatFromPreviousLine, LineWidth& width)

{

while (!resolver.position().atEnd() && !requiresLineBox(resolver.position(), lineInfo, LeadingWhitespace)) {

- LayoutObject* object = resolver.position().lineLayoutItem();

+ LayoutObject* object = resolver.position().getLineLayoutItem();

if (object->isOutOfFlowPositioned()) {

setStaticPositions(m_block, LineLayoutBox(toLayoutBox(object)), width.indentText());

if (object->style()->isOriginalDisplayInlineType()) {