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

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

Issue 18133003: Get rid of the extra vector when setting up the orderIterator. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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 | « no previous file | Source/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderFlexibleBox.h
diff --git a/Source/core/rendering/RenderFlexibleBox.h b/Source/core/rendering/RenderFlexibleBox.h
index 828aef5962aacc719e1f51637c18e085c3e9e95e..b5cd5a78192f73ced82e06ab2c67a68417c6dd01 100644
--- a/Source/core/rendering/RenderFlexibleBox.h
+++ b/Source/core/rendering/RenderFlexibleBox.h
@@ -84,10 +84,11 @@ private:
RenderBox* next();
void reset();
+ Vector<int> m_orderValues;
+
private:
const RenderFlexibleBox* m_flexibleBox;
RenderBox* m_currentChild;
- Vector<int> m_orderValues;
Vector<int>::const_iterator m_orderValuesIterator;
};
@@ -151,7 +152,7 @@ private:
LayoutUnit marginBoxAscentForChild(RenderBox*);
LayoutUnit computeChildMarginValue(Length margin, RenderView*);
- void computeMainAxisPreferredSizes(Vector<int>&);
+ void prepareOrderIteratorAndMargins();
LayoutUnit adjustChildSizeForMinAndMax(RenderBox*, LayoutUnit childSize);
bool computeNextFlexLine(OrderedFlexItemList& orderedChildren, LayoutUnit& preferredMainAxisExtent, double& totalFlexGrow, double& totalWeightedFlexShrink, LayoutUnit& minMaxAppliedMainAxisExtent, bool& hasInfiniteLineLength);
« no previous file with comments | « no previous file | Source/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698