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

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

Issue 945003002: Remove LayoutState. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: improve test Created 5 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: sky/engine/core/rendering/RenderBlockFlow.cpp
diff --git a/sky/engine/core/rendering/RenderBlockFlow.cpp b/sky/engine/core/rendering/RenderBlockFlow.cpp
index dffde38cce74cbd7ff46f3eb19fd47191b2e3606..1df301dfaeefd3a105acfc73f8859b2184fea8e9 100644
--- a/sky/engine/core/rendering/RenderBlockFlow.cpp
+++ b/sky/engine/core/rendering/RenderBlockFlow.cpp
@@ -60,11 +60,6 @@ RenderBlockFlow* RenderBlockFlow::createAnonymous(Document* document)
return renderer;
}
-bool RenderBlockFlow::updateLogicalWidthAndColumnWidth()
-{
- return RenderBlock::updateLogicalWidthAndColumnWidth();
-}
-
void RenderBlockFlow::layout()
{
ASSERT(needsLayout());
@@ -88,8 +83,6 @@ inline void RenderBlockFlow::layoutBlockFlow(SubtreeLayoutScope& layoutScope)
bool logicalWidthChanged = updateLogicalWidthAndColumnWidth();
bool relayoutChildren = logicalWidthChanged;
- LayoutState state(*this, locationOffset(), logicalWidthChanged);
-
LayoutUnit beforeEdge = borderBefore() + paddingBefore();
LayoutUnit afterEdge = borderAfter() + paddingAfter();
LayoutUnit previousHeight = logicalHeight();

Powered by Google App Engine
This is Rietveld 408576698