Attachment 422717 Details for Bug 222970 – Patch

[patch] Patch

bug-222970-20210309183628.patch (text/plain), 4.72 KB, created by Rob Buis on 2021-03-09 09:36:29 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2021-03-09 09:36:29 PST

Size: 4.72 KB

patch

obsolete

>Subversion Revision: 274143
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f7e1b889844e7d5d83afd4998043f46b086a350c..15ed1862cd01c4b902b9d5c721462da1bf7d9e77 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2021-03-09  Rob Buis  <rbuis@igalia.com>
>+
>+        Fix intrinsic-size-005.html
>+        https://bugs.webkit.org/show_bug.cgi?id=222970
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WIP.
>+
>+        * rendering/RenderBlock.cpp:
>+        (WebCore::RenderBlock::computeChildPreferredLogicalWidths const):
>+        * rendering/RenderBox.h:
>+
> 2021-03-09  Chris Lord  <clord@igalia.com>
> 
>         Allow creation of a CSSFontSelector with a non-Document ScriptExecutionContext
>diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp
>index 46b5c69fd4d49bd90d6d53d8887d9d89b3a40e71..a2874509afb0dd382d5244e9b8760eb75aa41d7f 100644
>--- a/Source/WebCore/rendering/RenderBlock.cpp
>+++ b/Source/WebCore/rendering/RenderBlock.cpp
>@@ -2403,6 +2403,12 @@ void RenderBlock::computeChildPreferredLogicalWidths(RenderObject& child, Layout
>             minPreferredLogicalWidth = maxPreferredLogicalWidth = downcast<RenderBox>(child).logicalHeight();
>             return;
>         }
>+        auto& box = downcast<RenderBox>(child);
>+        if (box.shouldComputeLogicalHeightFromAspectRatio() && box.style().logicalWidth().isFixed()) {
>+            LayoutUnit logicalWidth = adjustContentBoxLogicalWidthForBoxSizing(box.style().logicalWidth());
>+            minPreferredLogicalWidth = maxPreferredLogicalWidth = blockSizeFromAspectRatio(box.horizontalBorderAndPaddingExtent(), box.verticalBorderAndPaddingExtent(), LayoutUnit(box.style().logicalAspectRatio()), box.style().boxSizingForAspectRatio(), logicalWidth);
>+            return;
>+        }
>         minPreferredLogicalWidth = maxPreferredLogicalWidth = downcast<RenderBox>(child).computeLogicalHeightWithoutLayout();
>         return;
>     }
>diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h
>index 8d1a50349f024c4160bb026cf88d2c4a9c869913..0629743fe90039f7b29d77332a04e89f0916c4af 100644
>--- a/Source/WebCore/rendering/RenderBox.h
>+++ b/Source/WebCore/rendering/RenderBox.h
>@@ -650,6 +650,8 @@ override;
> 
>     LayoutRect absoluteAnchorRectWithScrollMargin(bool* insideFixed = nullptr) const override;
> 
>+    bool shouldComputeLogicalHeightFromAspectRatio() const;
>+
> protected:
>     RenderBox(Element&, RenderStyle&&, BaseTypeFlags);
>     RenderBox(Document&, RenderStyle&&, BaseTypeFlags);
>@@ -699,7 +701,6 @@ protected:
> 
>     void incrementVisuallyNonEmptyPixelCountIfNeeded(const IntSize&);
> 
>-    bool shouldComputeLogicalHeightFromAspectRatio() const;
>     bool shouldComputeLogicalWidthFromAspectRatio() const;
>     bool shouldComputeLogicalWidthFromAspectRatioAndInsets() const;
>     LayoutUnit computeLogicalWidthFromAspectRatio(RenderFragmentContainer* = nullptr) const;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 73861dbfdee394e273b6aa79e663d8b0998da5af..a238bbe175f3d12ff4e4a241d6462d0b08e21d0b 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2021-03-09  Rob Buis  <rbuis@igalia.com>
>+
>+        Fix intrinsic-size-005.html
>+        https://bugs.webkit.org/show_bug.cgi?id=222970
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Enable test that passes now.
>+
>+        * TestExpectations:
>+
> 2021-03-08  Antoine Quint  <graouts@webkit.org>
> 
>         Select CSS properties animating as float should not allow negative values
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index da7cef4a1ca41f9c0fd40846f4e421224b94e51f..ac986c0f217685c29c652bbd352ee55e123461bb 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -4560,7 +4560,6 @@ 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/intrinsic-size-005.html [ ImageOnlyFailure ]
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-008.html [ ImageOnlyFailure ]
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/table-element-001.html [ ImageOnlyFailure ]
> webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-001.html [ ImageOnlyFailure ]

Actions: View | Formatted Diff | Diff

Attachments on bug 222970: 422691 | 422694 | 422717 | 422748