[css-flexbox] Pass correct available width to constrainLogicalWidthByMinMax

When stretching we used to pass the wrong available width to constrainLogicalWidthByMinMax, leading to an incorrect calculation of percentage max/min widths. BUG=675333 R=mstensho@opera.com,eae@chromium.org Review-Url: https://codereview.chromium.org/2585423002 Cr-Commit-Position: refs/heads/master@{#439772}

[css-flexbox] Pass correct available width to constrainLogicalWidthByMinMax
When stretching we used to pass the wrong available width to constrainLogicalWidthByMinMax, leading to an incorrect calculation of percentage max/min widths. BUG=675333 R=mstensho@opera.com,eae@chromium.org Review-Url: https://codereview.chromium.org/2585423002 Cr-Commit-Position: refs/heads/master@{#439772}
1691bb10 · cbiesinger · Commit bot · 1b02fcf4 · 1691bb10 · 1691bb10
Commit 1691bb10 authored Dec 20, 2016 by cbiesinger Committed by Commit bot Dec 20, 2016
2 changed files
--- a/third_party/WebKit/LayoutTests/css3/flexbox/percentage-max-width-cross-axis.html
+++ b/third_party/WebKit/LayoutTests/css3/flexbox/percentage-max-width-cross-axis.html
+<!DOCTYPE html>
+<link rel="stylesheet" href="resources/flexbox.css">
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../../resources/check-layout-th.js"></script>
+<body onload="checkLayout('.flexbox')">
+<p>Both bars should be the same width</p>
+<div class="flexbox column" style="width: 400px;">
+  <div data-expected-width="200" style="margin-left: 50%; width: 50%; background: green;">
+    Content
+  </div>
+</div>
+<div class="flexbox column" style="width: 400px;">
+  <div data-expected-width="200" style="margin-left: 50%; max-width: 50%; background: blue;">
+    Content
+  </div>
+</div>
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
@@ -2132,8 +2132,8 @@ void LayoutFlexibleBox::applyStretchAlignmentToChild(
    LayoutUnit childWidth =
        (lineCrossAxisExtent - crossAxisMarginExtentForChild(child))
            .clampNegativeToZero();
-    childWidth =
+    childWidth = child.constrainLogicalWidthByMinMax(
-        child.constrainLogicalWidthByMinMax(childWidth, childWidth, this);
+        childWidth, crossAxisContentExtent(), this);
    if (childWidth != child.logicalWidth()) {
      child.setOverrideLogicalContentWidth(