Chromium Code Reviews| Index: Source/core/layout/LayoutFlexibleBox.cpp |
| diff --git a/Source/core/layout/LayoutFlexibleBox.cpp b/Source/core/layout/LayoutFlexibleBox.cpp |
| index 1eb668c54749a8922e573f36f951bdbcb2dc65f2..5e392a94b6bc6ff55f87b4877e4a8b459d577bee 100644 |
| --- a/Source/core/layout/LayoutFlexibleBox.cpp |
| +++ b/Source/core/layout/LayoutFlexibleBox.cpp |
| @@ -985,7 +985,10 @@ bool LayoutFlexibleBox::resolveFlexibleLengths(FlexSign flexSign, const OrderedF |
| double extraSpace = 0; |
| bool childShrunk = false; |
| if (availableFreeSpace > 0 && totalFlexGrow > 0 && flexSign == PositiveFlexibility && std::isfinite(totalFlexGrow)) { |
| - extraSpace = availableFreeSpace * child->style()->flexGrow() / totalFlexGrow; |
| + if (totalFlexGrow > 0 && totalFlexGrow < 1) |
|
harpreet.sk
2015/09/07 13:45:45
totalFlexGrow > 0 not required as it is already c
ashlin.j
2015/09/21 06:34:00
Done.
|
| + extraSpace = availableFreeSpace * child->style()->flexGrow(); |
| + else |
| + extraSpace = availableFreeSpace * child->style()->flexGrow() / totalFlexGrow; |
| } else if (availableFreeSpace < 0 && totalWeightedFlexShrink > 0 && flexSign == NegativeFlexibility && std::isfinite(totalWeightedFlexShrink) && child->style()->flexShrink()) { |
| extraSpace = availableFreeSpace * child->style()->flexShrink() * childInnerFlexBaseSize / totalWeightedFlexShrink; |
| childShrunk = true; |