Attachment 421407 Details for Bug 222357 – Patch

[patch] Patch

bug-222357-20210224163457.patch (text/plain), 4.37 KB, created by Rob Buis on 2021-02-24 07:34:58 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2021-02-24 07:34:58 PST

Size: 4.37 KB

patch

obsolete

>Subversion Revision: 273373
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f1aea653e199da1daee16d1d013ef7d476cbee53..0ef90c46fa515482277ba6fc7ffa6fd73e59f6c3 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2021-02-24  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-23  Frederic Wang  <fwang@igalia.com>
> 
>         Nullptr crash in ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline
>diff --git a/Source/WebCore/rendering/RenderFlexibleBox.cpp b/Source/WebCore/rendering/RenderFlexibleBox.cpp
>index d3cd228c56b93392cdf0dc47436a09023c1f7c24..bc38e1f20f19b5d28ec8d6571fc2bfcdd98a2e94 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;
>     };
>@@ -1205,7 +1210,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()) || child.style().hasAspectRatio())
>             contentSize = adjustChildSizeForAspectRatioCrossAxisMinAndMax(child, contentSize);
>         ASSERT(contentSize >= 0);
>         contentSize = std::min(contentSize, maxExtent.valueOr(contentSize));
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 6e89902c8562dd3447e0ac0f6ba8718a9f9ea569..7dbb0a05a6fb158d2f0b504c773e7a723c77951d 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2021-02-24  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-24  Rob Buis  <rbuis@igalia.com>
> 
>         Null check ArrayBufferView RefPtr
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index b760481436c61041eb975ad7f5fb2168ee1a5e6e..94f0cf9a1113665c26ac974c2770d823ca8201f3 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -4553,7 +4553,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 ]

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