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

Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

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

index 468ccc3017aade902d0d3643e4f84b8f2a66fd45..b8672f2c091e19901cac15e0ee58aff5d6a2c10b 100644

--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

@@ -953,7 +953,7 @@ void LayoutBlockFlow::rebuildFloatsFromIntruding()

}

if (oldFloatingObject->originatingLine() && !selfNeedsLayout()) {

- ASSERT(oldFloatingObject->originatingLine()->lineLayoutItem().isEqual(this));

+ ASSERT(oldFloatingObject->originatingLine()->getLineLayoutItem().isEqual(this));

oldFloatingObject->originatingLine()->markDirty();

}

@@ -2300,7 +2300,7 @@ void LayoutBlockFlow::removeFloatingObject(LayoutBox* floatBox)

}

if (floatingObject.originatingLine()) {

if (!selfNeedsLayout()) {

- ASSERT(floatingObject.originatingLine()->lineLayoutItem().isEqual(this));

+ ASSERT(floatingObject.originatingLine()->getLineLayoutItem().isEqual(this));

floatingObject.originatingLine()->markDirty();

}

#if ENABLE(ASSERT)