Attachment 421775 Details for Bug 222357 – Patch

[patch] Patch

bug-222357-20210228114041.patch (text/plain), 5.88 KB, created by Rob Buis on 2021-02-28 02:40:42 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2021-02-28 02:40:42 PST

Size: 5.88 KB

patch

obsolete

>Subversion Revision: 273627
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0b6b23030594fe1c4fbf38c3570c4b8c4c0907f2..3e6a7fdf3956ff89789b956239c20e06adba2bf2 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-27  Sam Weinig  <weinig@apple.com>
> 
>         Remove support for 'pixel' and 'pos' CSSOM prefixes
>diff --git a/Source/WebCore/rendering/RenderFlexibleBox.cpp b/Source/WebCore/rendering/RenderFlexibleBox.cpp
>index d3cd228c56b93392cdf0dc47436a09023c1f7c24..4b394eeb7cff9a2f640b8bd214a9b33fd3d7e50c 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;
>     };
>@@ -1186,15 +1191,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 +1217,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/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 ]

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