Attachment 432866 Details for Bug 225860 – Patch

[patch] Patch

bug-225860-20210704205836.patch (text/plain), 6.76 KB, created by Rob Buis on 2021-07-04 11:58:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2021-07-04 11:58:38 PDT

Size: 6.76 KB

patch

obsolete

>Subversion Revision: 279551
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 63abad93a72cb97e09f236ddd6ab99b41c34d23c..29bf7c7db881d982469350813e277b57f2e45f80 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2021-07-04  Rob Buis  <rbuis@igalia.com>
>+
>+        Fix grid-aspect-ratio-018+19.html
>+        https://bugs.webkit.org/show_bug.cgi?id=225860
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Do not apply aspect ratio if we have stretch alignment:
>+        https://drafts.csswg.org/css-grid/#grid-item-sizing
>+
>+        * rendering/RenderBox.cpp:
>+        (WebCore::RenderBox::shouldComputeLogicalWidthFromAspectRatio const):
>+        * rendering/RenderGrid.cpp:
>+        (WebCore::RenderGrid::hasAutoSizeInColumnAxis const):
>+        (WebCore::RenderGrid::hasAutoSizeInRowAxis const):
>+
> 2021-07-04  Eric Carlson  <eric.carlson@apple.com>
> 
>         WebAudio auto-play policy should come from top document
>diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
>index 689b17dc080eeb550a2ab7486bfb87ec8ca984f1..2b7d5ed9c3b6d21b9dd3bc1c87335aa5a5b0c37d 100644
>--- a/Source/WebCore/rendering/RenderBox.cpp
>+++ b/Source/WebCore/rendering/RenderBox.cpp
>@@ -5252,6 +5252,9 @@ bool RenderBox::shouldComputeLogicalWidthFromAspectRatio() const
>     if (shouldIgnoreAspectRatio())
>         return false;
> 
>+    if (isGridItem() && style().justifySelf().position() == ItemPosition::Stretch)
>+        return false;
>+
>     auto isResolvablePercentageHeight = [&] {
>         return style().logicalHeight().isPercentOrCalculated() && (isOutOfFlowPositioned() || percentageLogicalHeightIsResolvable());
>     };
>diff --git a/Source/WebCore/rendering/RenderGrid.cpp b/Source/WebCore/rendering/RenderGrid.cpp
>index 9e007f8ddb70d805f0f1cfe0eabfdb27cb8e6156..a6e062aff6218b203a59bd8b07531eac772ea63d 100644
>--- a/Source/WebCore/rendering/RenderGrid.cpp
>+++ b/Source/WebCore/rendering/RenderGrid.cpp
>@@ -1867,11 +1867,11 @@ const char* RenderGrid::renderName() const
> bool RenderGrid::hasAutoSizeInColumnAxis(const RenderBox& child) const
> {
>     if (child.style().hasAspectRatio()) {
>-        if (isHorizontalWritingMode() == child.isHorizontalWritingMode()) {
>+        if (isHorizontalWritingMode() == child.isHorizontalWritingMode() && child.style().alignSelf().position() != ItemPosition::Stretch) {
>             // A non-auto inline size means the same for block size (column axis size) because of the aspect ratio.
>             if (!child.style().logicalWidth().isAuto())
>                 return false;
>-        } else {
>+        } else if (child.style().justifySelf().position() != ItemPosition::Stretch) {
>             const Length& logicalHeight = child.style().logicalHeight();
>             if (logicalHeight.isFixed() || (logicalHeight.isPercentOrCalculated() && child.percentageLogicalHeightIsResolvable()))
>                 return false;
>@@ -1883,12 +1883,12 @@ bool RenderGrid::hasAutoSizeInColumnAxis(const RenderBox& child) const
> bool RenderGrid::hasAutoSizeInRowAxis(const RenderBox& child) const
> {
>     if (child.style().hasAspectRatio()) {
>-        if (isHorizontalWritingMode() == child.isHorizontalWritingMode()) {
>+        if (isHorizontalWritingMode() == child.isHorizontalWritingMode() && child.style().justifySelf().position() != ItemPosition::Stretch) {
>             // A non-auto block size means the same for inline size (row axis size) because of the aspect ratio.
>             const Length& logicalHeight = child.style().logicalHeight();
>             if (logicalHeight.isFixed() || (logicalHeight.isPercentOrCalculated() && child.percentageLogicalHeightIsResolvable()))
>                 return false;
>-        } else {
>+        } else if (child.style().alignSelf().position() != ItemPosition::Stretch) {
>             if (!child.style().logicalWidth().isAuto())
>                 return false;
>         }
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index d03679f3781daf3dc9d7f906b237839d23e21d01..b4595a097d21effa0a19fe77112d9b9af1991104 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2021-07-04  Rob Buis  <rbuis@igalia.com>
>+
>+        Fix grid-aspect-ratio-018+19.html
>+        https://bugs.webkit.org/show_bug.cgi?id=225860
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Unskip tests that now pass.
>+
>+        * TestExpectations:
>+
> 2021-07-04  Rob Buis  <rbuis@igalia.com>
> 
>         Resync web-platform-tests/css/css-sizing/aspect-ratio from upstream
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 25b11c78d1a8e2c0269ca597714950e4a9a75c27..00e60ae07df933f05ec76d99f502b2e2574ac489 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -4628,16 +4628,8 @@ webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/
> 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-018.html [ ImageOnlyFailure ]
>-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-019.html [ ImageOnlyFailure ]
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-030.html [ ImageOnlyFailure ]
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-031.html [ ImageOnlyFailure ]
>-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-032.html [ ImageOnlyFailure ]
>-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-033.html [ ImageOnlyFailure ]
>-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-034.html [ ImageOnlyFailure ]
>-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-035.html [ ImageOnlyFailure ]
>-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-036.html [ ImageOnlyFailure ]
>-webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-037.html [ ImageOnlyFailure ]
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-038.html [ ImageOnlyFailure ]
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-034.html [ ImageOnlyFailure ]
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/select-element-001.html [ ImageOnlyFailure ]

Actions: View | Formatted Diff | Diff

Attachments on bug 225860: 428816 | 432866 | 433747 | 433777 | 433786 | 433791 | 433855