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

Unified Diff: Source/core/rendering/RenderBlockFlow.cpp

Issue 135043007: Remove default parameter from virtual layoutBlock function (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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 | « Source/core/rendering/RenderBlockFlow.h ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlockFlow.cpp
diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp
index 8a4f224b3df5663e1a5a323024160c2b4bd0edd9..6e47cf28e2bc9522139a46e6388e48e4e56b2625 100644
--- a/Source/core/rendering/RenderBlockFlow.cpp
+++ b/Source/core/rendering/RenderBlockFlow.cpp
@@ -221,7 +221,7 @@ bool RenderBlockFlow::relayoutForPagination(bool hasSpecifiedPageLogicalHeight,
if (columnHeight && columnHeight != pageLogicalHeight) {
statePusher.pop();
setEverHadLayout(true);
- layoutBlock(false, columnHeight);
+ layoutBlockFlow(false, columnHeight);
return true;
}
}
@@ -245,7 +245,12 @@ bool RenderBlockFlow::isSelfCollapsingBlock() const
return m_hasOnlySelfCollapsingChildren;
}
-void RenderBlockFlow::layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight)
+void RenderBlockFlow::layoutBlock(bool relayoutChildren)
+{
+ layoutBlockFlow(relayoutChildren);
+}
+
+void RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit pageLogicalHeight)
{
ASSERT(needsLayout());
ASSERT(isInlineBlockOrInlineTable() || !isInline());
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.h ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698