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

Unified Diff: sky/engine/core/rendering/RenderBlockFlow.cpp

Issue 876663003: Remove layoutBlock. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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 | « sky/engine/core/rendering/RenderBlockFlow.h ('k') | sky/engine/core/rendering/RenderFlexibleBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBlockFlow.cpp
diff --git a/sky/engine/core/rendering/RenderBlockFlow.cpp b/sky/engine/core/rendering/RenderBlockFlow.cpp
index 834241c5c8beb17f6089a98a766209aa959d83fd..194dabea715651607a3d16dd74c9339b41b89cd7 100644
--- a/sky/engine/core/rendering/RenderBlockFlow.cpp
+++ b/sky/engine/core/rendering/RenderBlockFlow.cpp
@@ -65,17 +65,17 @@ bool RenderBlockFlow::updateLogicalWidthAndColumnWidth()
return RenderBlock::updateLogicalWidthAndColumnWidth();
}
-void RenderBlockFlow::layoutBlock(bool relayoutChildren)
+void RenderBlockFlow::layout()
{
ASSERT(needsLayout());
ASSERT(isInlineBlock() || !isInline());
- if (!relayoutChildren && simplifiedLayout())
+ if (simplifiedLayout())
return;
SubtreeLayoutScope layoutScope(*this);
- layoutBlockFlow(relayoutChildren, layoutScope);
+ layoutBlockFlow(layoutScope);
updateLayerTransformAfterLayout();
@@ -86,11 +86,11 @@ void RenderBlockFlow::layoutBlock(bool relayoutChildren)
clearNeedsLayout();
}
-inline void RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, SubtreeLayoutScope& layoutScope)
+inline void RenderBlockFlow::layoutBlockFlow(SubtreeLayoutScope& layoutScope)
{
LayoutUnit oldLeft = logicalLeft();
bool logicalWidthChanged = updateLogicalWidthAndColumnWidth();
- relayoutChildren |= logicalWidthChanged;
+ bool relayoutChildren = logicalWidthChanged;
LayoutState state(*this, locationOffset(), logicalWidthChanged);
« no previous file with comments | « sky/engine/core/rendering/RenderBlockFlow.h ('k') | sky/engine/core/rendering/RenderFlexibleBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698