Attachment 421776 Details for Bug 222357 – Patch

[patch] Patch

bug-222357-20210228163018.patch (text/plain), 12.87 KB, created by Rob Buis on 2021-02-28 07:30:20 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2021-02-28 07:30:20 PST

Size: 12.87 KB

patch

obsolete

>Subversion Revision: 273635
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d3e92d60a623eb383027bd2518e55d767a89755d..ed6a53f95cea32e4df10d3d17febd08d57a5cfc7 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2021-02-28  Rob Buis  <rbuis@igalia.com>
>+
>+        Fix flex-aspect-ratio-025.html
>+        https://bugs.webkit.org/show_bug.cgi?id=222357
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WIP.
>+
>+        * rendering/RenderFlexibleBox.cpp:
>+        (WebCore::RenderFlexibleBox::computeMainSizeFromAspectRatioUsing const):
>+        (WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
>+
> 2021-02-28  Antoine Quint  <graouts@webkit.org>
> 
>         Blending of border-image-width should be discrete between "auto" values and other types
>diff --git a/Source/WebCore/rendering/RenderFlexibleBox.cpp b/Source/WebCore/rendering/RenderFlexibleBox.cpp
>index d3cd228c56b93392cdf0dc47436a09023c1f7c24..e2e4481e50945cb6c8aec64144b0407fdff0e0b7 100644
>--- a/Source/WebCore/rendering/RenderFlexibleBox.cpp
>+++ b/Source/WebCore/rendering/RenderFlexibleBox.cpp
>@@ -793,7 +793,12 @@ LayoutUnit RenderFlexibleBox::computeMainSizeFromAspectRatioUsing(const RenderBo
>         // We need to substract the border and padding extent from the cross axis.
>         // Furthermore, the sizing calculations that floor the content box size at zero when applying box-sizing are also ignored.
>         // https://drafts.csswg.org/css-flexbox/#algo-main-item.
>-        if (box.style().boxSizing() == BoxSizing::BorderBox)
>+        bool subtractBorderPadding = false;
>+        if (box.style().hasAspectRatio())
>+            subtractBorderPadding = box.style().boxSizingForAspectRatio() == BoxSizing::ContentBox;
>+        else if (box.style().boxSizing() == BoxSizing::BorderBox)
>+            subtractBorderPadding = true;
>+        if (subtractBorderPadding)
>             value -= isHorizontalFlow() ? box.verticalBorderAndPaddingExtent() : box.horizontalBorderAndPaddingExtent();
>         return value;
>     };
>@@ -816,15 +821,18 @@ LayoutUnit RenderFlexibleBox::computeMainSizeFromAspectRatioUsing(const RenderBo
> 
>     const LayoutSize& childIntrinsicSize = child.intrinsicSize();
>     double ratio;
>-    if (child.style().aspectRatioType() == AspectRatioType::Ratio || (child.style().aspectRatioType() == AspectRatioType::AutoAndRatio && childIntrinsicSize.isEmpty()))
>+    LayoutUnit borderPadding;
>+    if (child.style().aspectRatioType() == AspectRatioType::Ratio || (child.style().aspectRatioType() == AspectRatioType::AutoAndRatio && childIntrinsicSize.isEmpty())) {
>         ratio = child.style().aspectRatioWidth() / child.style().aspectRatioHeight();
>-    else {
>+        if (child.style().boxSizingForAspectRatio() == BoxSizing::BorderBox)
>+            borderPadding = isHorizontalFlow() ? child.horizontalBorderAndPaddingExtent() : child.verticalBorderAndPaddingExtent();
>+    } else {
>         ASSERT(childIntrinsicSize.height());
>         ratio = childIntrinsicSize.width().toFloat() / childIntrinsicSize.height().toFloat();
>     }
>     if (isHorizontalFlow())
>-        return LayoutUnit(crossSize.value() * ratio);
>-    return LayoutUnit(crossSize.value() / ratio);
>+        return LayoutUnit(crossSize.value() * ratio) - borderPadding;
>+    return LayoutUnit(crossSize.value() / ratio) - borderPadding;
> }
> 
> void RenderFlexibleBox::setFlowAwareLocationForChild(RenderBox& child, const LayoutPoint& location)
>@@ -1186,15 +1194,22 @@ void RenderFlexibleBox::prepareOrderIteratorAndMargins()
> LayoutUnit RenderFlexibleBox::adjustChildSizeForMinAndMax(const RenderBox& child, LayoutUnit childSize)
> {
>     Length max = mainSizeLengthForChild(MaxSize, child);
>+    Length crossMax = crossSizeLengthForChild(MaxSize, child);
>     Optional<LayoutUnit> maxExtent = WTF::nullopt;
>     if (max.isSpecifiedOrIntrinsic()) {
>         maxExtent = computeMainAxisExtentForChild(child, MaxSize, max);
>         childSize = std::min(childSize, maxExtent.valueOr(childSize));
>+    } else if (child.style().hasAspectRatio() && childCrossSizeIsDefinite(child, crossMax)) {
>+        maxExtent = computeMainSizeFromAspectRatioUsing(child, crossMax);
>+        childSize = std::min(childSize, maxExtent.valueOr(childSize));
>     }
> 
>     Length min = mainSizeLengthForChild(MinSize, child);
>+    Length crossMin = crossSizeLengthForChild(MinSize, child);
>     if (min.isSpecifiedOrIntrinsic())
>         return std::max(childSize, std::max(0_lu, computeMainAxisExtentForChild(child, MinSize, min).valueOr(childSize)));
>+    else if (child.style().hasAspectRatio() && childCrossSizeIsDefinite(child, crossMin))
>+        return std::max(childSize, computeMainSizeFromAspectRatioUsing(child, crossMin));
>     
>     if (shouldApplyMinSizeAutoForChild(child)) {
>         // FIXME: If the min value is expected to be valid here, we need to come up with a non optional version of computeMainAxisExtentForChild and
>@@ -1205,7 +1220,7 @@ LayoutUnit RenderFlexibleBox::adjustChildSizeForMinAndMax(const RenderBox& child
>             contentSize = computeMainSizeFromAspectRatioUsing(child, childCrossSizeLength);
>         else
>             contentSize = computeMainAxisExtentForChild(child, MinSize, Length(LengthType::MinContent)).valueOr(0);
>-        if (child.hasAspectRatio() && child.intrinsicSize().height())
>+        if ((child.hasAspectRatio() && child.intrinsicSize().height()))
>             contentSize = adjustChildSizeForAspectRatioCrossAxisMinAndMax(child, contentSize);
>         ASSERT(contentSize >= 0);
>         contentSize = std::min(contentSize, maxExtent.valueOr(contentSize));
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 4609407dbf3ccdf6facb0d81617452ccca0cad2b..d084eea987691dbb2410170dbb4b92f225f842a1 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2021-02-28  Rob Buis  <rbuis@igalia.com>
>+
>+        Fix flex-aspect-ratio-025.html
>+        https://bugs.webkit.org/show_bug.cgi?id=222357
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Adapt platform test expectations.
>+
>+        * TestExpectations:
>+
> 2021-02-27  Sam Weinig  <weinig@apple.com>
> 
>        Remove support for 'pixel' and 'pos' CSSOM prefixes
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index 20e65c0ebbacea903e9550e676279ea475eea20a..6820d85def37fae4f3d5a394a0a543f8b6671d99 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,13 @@
>+2021-02-28  Rob Buis  <rbuis@igalia.com>
>+
>+        Fix flex-aspect-ratio-025.html
>+        https://bugs.webkit.org/show_bug.cgi?id=222357
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-025.html:
>+        * web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-026.html:
>+
> 2021-02-28  Antoine Quint  <graouts@webkit.org>
> 
>         Blending of border-image-width should be discrete between "auto" values and other types
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index d95d40f613cf7781e41cef03df79e7b6364694f3..8dc189257bc7b1cd8618c96cdba38045f23863e9 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -4554,8 +4554,6 @@ webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/
> # flex-basis:content
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-021.html [ ImageOnlyFailure ]
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-022.html [ ImageOnlyFailure ]
>-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-025.html [ ImageOnlyFailure ]
>-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-026.html [ ImageOnlyFailure ]
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-015.html [ ImageOnlyFailure ]
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-016.html [ ImageOnlyFailure ]
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-017.html [ ImageOnlyFailure ]
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-025.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-025.html
>index fa9ce8ebce69f02e6b13d9d2233d1e3b46c7f1ab..c4ff8110d7bed7079c864ddf192f8242932e588d 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-025.html
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-025.html
>@@ -14,6 +14,7 @@
>   .item {
>     background: green;
>     padding-top: 15px;
>+    padding-left: 10px;
>     box-sizing: border-box;
>   }
>   </style>
>@@ -49,25 +50,25 @@
>        because its value contains 'auto'. -->
>   <div class="flexContainer" style="width: auto;">
>     
>-    <div class="item" style="min-width:0; height: 25px; aspect-ratio: auto 20/1;"></div>
>+         yielding a resolved flex base size of 190px. -->
>+    <div class="item" style="min-width:0; height: 25px; aspect-ratio: auto 19/1;"></div>
>   </div>
> 
>   <div class="flexContainer">
>     
>-    <div class="item" style="height: 25px; aspect-ratio: auto 20/1;"></div>
>+         yielding a resolved min-width:auto of 190px. -->
>+    <div class="item" style="height: 25px; aspect-ratio: auto 19/1;"></div>
>   </div>
> 
>   <div class="flexContainer">
>     
>-    <div class="item" style="min-height: 25px; aspect-ratio: auto 20/1;"></div>
>+         yielding a resolved min-width:auto of 190px. -->
>+    <div class="item" style="min-height: 25px; aspect-ratio: auto 19/1;"></div>
>   </div>
> 
>   <div class="flexContainer">
>     
>-    <div class="item" style="max-height: 25px; height: 100px; aspect-ratio: auto 20/1;"></div>
>+         to the main axis, yielding a resolved min-width:auto of 190px. -->
>+    <div class="item" style="max-height: 25px; height: 100px; aspect-ratio: auto 19/1;"></div>
>   </div>
> </html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-026.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-026.html
>index 1df14468632baa8ffd03d690f7ddaa618acd7bf6..c4a250818bb7786e2f395922d28e3c7519b4ea3a 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-026.html
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-026.html
>@@ -15,6 +15,7 @@
>   .item {
>     background: green;
>     padding-left: 15px;
>+    padding-top: 10px;
>     box-sizing: border-box;
>   }
>   .item > div {
>@@ -53,25 +54,25 @@
>        because its value contains 'auto'. -->
>   <div class="flexContainer" style="height: auto;">
>     
>-    <div class="item" style="min-height:0; width: 25px; aspect-ratio: auto 1/20;"><div></div></div>
>+         yielding a resolved flex base size of 190px. -->
>+    <div class="item" style="min-height:0; width: 25px; aspect-ratio: auto 1/19;"><div></div></div>
>   </div>
> 
>   <div class="flexContainer">
>     
>-    <div class="item" style="width: 25px; aspect-ratio: auto 1/20;"><div></div></div>
>+         yielding a resolved min-height:auto of 190px. -->
>+    <div class="item" style="width: 25px; aspect-ratio: auto 1/19;"><div></div></div>
>   </div>
> 
>   <div class="flexContainer">
>     
>-    <div class="item" style="min-width: 25px; aspect-ratio: auto 1/20;"><div></div></div>
>+         yielding a resolved min-height:auto of 190px. -->
>+    <div class="item" style="min-width: 25px; aspect-ratio: auto 1/19;"><div></div></div>
>   </div>
> 
>   <div class="flexContainer">
>     
>-    <div class="item" style="max-width: 25px; width: 100px; aspect-ratio: auto 1/20;"><div></div></div>
>+         yielding a resolved min-height:auto of 190px. -->
>+    <div class="item" style="max-width: 25px; width: 100px; aspect-ratio: auto 1/19;"><div></div></div>
>   </div>
> </html>

Actions: View | Formatted Diff | Diff

Attachments on bug 222357: 421407 | 421649 | 421775 | 421776 | 421915 | 422056 | 422071 | 422085 | 422206 | 422374 | 422484 | 422485 | 422492 | 422494 | 422500 | 422522 | 422523 | 422525 | 422560 | 422809 | 422811 | 429277 | 429282 | 429309 | 429875 | 430467 | 431546 | 432280 | 432480 | 432574 | 432596 | 433785 | 437454 | 437625