| Index: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
|
| index 5d29d7d83cfdb53efe188265ae7ba4ccd415314d..1fa008d2edafece5ab3438349b1271b28052c32d 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
|
| @@ -664,8 +664,8 @@ LayoutUnit LayoutFlexibleBox::computeMainSizeFromAspectRatioUsing(const LayoutBo
|
| const LayoutSize& childIntrinsicSize = child.intrinsicSize();
|
| double ratio = childIntrinsicSize.width().toFloat() / childIntrinsicSize.height().toFloat();
|
| if (isHorizontalFlow())
|
| - return crossSize * ratio;
|
| - return crossSize / ratio;
|
| + return LayoutUnit(crossSize * ratio);
|
| + return LayoutUnit(crossSize / ratio);
|
| }
|
|
|
| void LayoutFlexibleBox::setFlowAwareLocationForChild(LayoutBox& child, const LayoutPoint& location)
|
| @@ -1099,7 +1099,7 @@ bool LayoutFlexibleBox::resolveFlexibleLengths(FlexSign flexSign, const OrderedF
|
|
|
| double sumFlexFactors = (flexSign == PositiveFlexibility) ? totalFlexGrow : totalFlexShrink;
|
| if (sumFlexFactors > 0 && sumFlexFactors < 1) {
|
| - LayoutUnit fractional = availableFreeSpace * sumFlexFactors;
|
| + LayoutUnit fractional(availableFreeSpace * sumFlexFactors);
|
| if (fractional.abs() < remainingFreeSpace.abs())
|
| remainingFreeSpace = fractional;
|
| }
|
|
|