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

Unified Diff: sky/engine/core/rendering/RenderFlexibleBox.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/RenderFlexibleBox.cpp
diff --git a/sky/engine/core/rendering/RenderFlexibleBox.cpp b/sky/engine/core/rendering/RenderFlexibleBox.cpp
index e50ed6ea4a64ab4a7b8cb9b91a619eb302eb6e7a..cb22cd24bd5b6c9690f5f977ab9f9f62515811e8 100644
--- a/sky/engine/core/rendering/RenderFlexibleBox.cpp
+++ b/sky/engine/core/rendering/RenderFlexibleBox.cpp
@@ -224,26 +224,22 @@ void RenderFlexibleBox::layout()
LayoutUnit previousHeight = logicalHeight();
setLogicalHeight(borderAndPaddingLogicalHeight());
- {
- LayoutState state(*this, locationOffset());
-
- m_numberOfInFlowChildrenOnFirstLine = -1;
+ m_numberOfInFlowChildrenOnFirstLine = -1;
- prepareOrderIteratorAndMargins();
+ prepareOrderIteratorAndMargins();
- ChildFrameRects oldChildRects;
- appendChildFrameRects(oldChildRects);
+ ChildFrameRects oldChildRects;
+ appendChildFrameRects(oldChildRects);
- layoutFlexItems(relayoutChildren);
+ layoutFlexItems(relayoutChildren);
- if (logicalHeight() != previousHeight)
- relayoutChildren = true;
+ if (logicalHeight() != previousHeight)
+ relayoutChildren = true;
- layoutPositionedObjects(relayoutChildren);
+ layoutPositionedObjects(relayoutChildren);
- // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint invalidations for more overflow than it needs to.
- computeOverflow(clientLogicalBottomAfterRepositioning());
- }
+ // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint invalidations for more overflow than it needs to.
+ computeOverflow(clientLogicalBottomAfterRepositioning());
updateLayerTransformAfterLayout();

Powered by Google App Engine
This is Rietveld 408576698