third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h - Issue 1470373003: [css-flexbox] Correctly implement flex factors < 1

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

Issue 1470373003: [css-flexbox] Correctly implement flex factors < 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: even more correct now Created 5 years, 1 month 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 | « third_party/WebKit/LayoutTests/css3/flexbox/flex-grow-less-than-one.html ('k') | third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 e404192d805eb603ee053a27bae82968c5ea170c..a4948ca887e121316082056525893d4280ea4292 100644

--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h

+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h

@@ -155,10 +155,10 @@ private:

void prepareOrderIteratorAndMargins();

LayoutUnit adjustChildSizeForMinAndMax(const LayoutBox& child, LayoutUnit childSize);

// 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& totalWeightedFlexShrink, LayoutUnit& sumHypotheticalMainSize, bool relayoutChildren);

+ bool computeNextFlexLine(OrderedFlexItemList& orderedChildren, LayoutUnit& sumFlexBaseSize, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink, LayoutUnit& sumHypotheticalMainSize, bool relayoutChildren);

- bool resolveFlexibleLengths(FlexSign, const OrderedFlexItemList&, LayoutUnit& availableFreeSpace, double& totalFlexGrow, double& totalWeightedFlexShrink, InflexibleFlexItemSize&, Vector<LayoutUnit, 16>& childSizes);

- void freezeViolations(const Vector<Violation>&, LayoutUnit& availableFreeSpace, double& totalFlexGrow, double& totalWeightedFlexShrink, InflexibleFlexItemSize&);

+ bool resolveFlexibleLengths(FlexSign, const OrderedFlexItemList&, LayoutUnit availableFreeSpace, LayoutUnit& remainingFreeSpace, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink, InflexibleFlexItemSize&, Vector<LayoutUnit, 16>& childSizes);

leviw_travelin_and_unemployed 2015/11/25 19:00:22 I can follow the code and it looks good, but I fee

cbiesinger 2015/11/25 23:19:09 I added a comment in the calling function. Does th

+ void freezeViolations(const Vector<Violation>&, LayoutUnit& availableFreeSpace, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink, InflexibleFlexItemSize&);

void resetAutoMarginsAndLogicalTopInCrossAxis(LayoutBox& child);

void setOverrideMainAxisSizeForChild(LayoutBox& child, LayoutUnit childPreferredSize);