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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h

Issue 2170533002: [css-flexbox] Some more code refactoring (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
index d907bb772451ecb47cf91cdfc4ad7d28f72833d5..d736ddfb2a445d682de38cc26a36f25f48bed6a8 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
@@ -147,8 +147,7 @@ private:
void setFlowAwareLocationForChild(LayoutBox& child, const LayoutPoint&);
void adjustAlignmentForChild(LayoutBox& child, LayoutUnit);
ItemPosition alignmentForChild(const LayoutBox& child) const;
- LayoutUnit mainAxisBorderAndPaddingExtentForChild(const LayoutBox& child) const;
- LayoutUnit computeInnerFlexBaseSizeForChild(LayoutBox& child, ChildLayoutType = LayoutIfNeeded);
+ LayoutUnit computeInnerFlexBaseSizeForChild(LayoutBox& child, LayoutUnit mainAxisBorderAndPadding, ChildLayoutType = LayoutIfNeeded);
bool mainAxisLengthIsDefinite(const LayoutBox& child, const Length& flexBasis) const;
bool crossAxisLengthIsDefinite(const LayoutBox& child, const Length& flexBasis) const;
bool childFlexBaseSizeRequiresLayout(const LayoutBox& child) const;
@@ -174,6 +173,7 @@ private:
void prepareOrderIteratorAndMargins();
LayoutUnit adjustChildSizeForMinAndMax(const LayoutBox& child, LayoutUnit childSize);
LayoutUnit adjustChildSizeForAspectRatioCrossAxisMinAndMax(const LayoutBox& child, LayoutUnit childSize);
+ FlexItem constructFlexItem(LayoutBox& child, ChildLayoutType);
// The hypothetical main size of an item is the flex base size clamped according to its min and max main size properties
bool computeNextFlexLine(OrderedFlexItemList& orderedChildren, LayoutUnit& sumFlexBaseSize, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink, LayoutUnit& sumHypotheticalMainSize, bool relayoutChildren);
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698