Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

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: 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
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 7ad62e9e70c3c718c76842a029d6ad7fd48ce638..1bb6ccc5e24e3f6c3e8277a3d157f84a2d503d13 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)

Powered by Google App Engine
This is Rietveld 408576698