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

Unified Diff: Source/core/rendering/RenderFlexibleBox.h

Issue 138683005: Avoid forcing layout on children with orthogonal flow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Now with expected results! 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
Index: Source/core/rendering/RenderFlexibleBox.h
diff --git a/Source/core/rendering/RenderFlexibleBox.h b/Source/core/rendering/RenderFlexibleBox.h
index 0dc737bee245b2db047fe5d931ab658e754cab53..04835af71b27f7e9cb204076996fcd5e745bfdd2 100644
--- a/Source/core/rendering/RenderFlexibleBox.h
+++ b/Source/core/rendering/RenderFlexibleBox.h
@@ -64,6 +64,7 @@ protected:
virtual bool supportsPartialLayout() const OVERRIDE { return false; }
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+ virtual void removeChild(RenderObject*) FINAL OVERRIDE;
private:
enum FlexSign {
@@ -156,6 +157,7 @@ private:
void flipForRightToLeftColumn();
void flipForWrapReverse(const Vector<LineContext>&, LayoutUnit crossAxisStartEdge);
+ HashMap<const RenderObject*, LayoutUnit> m_intrinsicSizeAlongMainAxis;
mutable OrderIterator m_orderIterator;
int m_numberOfInFlowChildrenOnFirstLine;
};

Powered by Google App Engine
This is Rietveld 408576698