Attachment 422691 Details for Bug 222970 – Patch

[patch] Patch

bug-222970-20210309150334.patch (text/plain), 2.53 KB, created by Rob Buis on 2021-03-09 06:03:36 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

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

Size: 2.53 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..41f835b2ac5de18ce1c3bc8da176b7c80758c6dd 100644
>--- a/Source/WebCore/rendering/RenderBlock.cpp
>+++ b/Source/WebCore/rendering/RenderBlock.cpp
>@@ -2402,7 +2402,8 @@ void RenderBlock::computeChildPreferredLogicalWidths(RenderObject& child, Layout
>         if (!child.needsLayout()) {
>             minPreferredLogicalWidth = maxPreferredLogicalWidth = downcast<RenderBox>(child).logicalHeight();
>             return;
>-        }
>+        } else if (downcast<RenderBox>(child).shouldComputeLogicalHeightFromAspectRatio())
>+            downcast<RenderBox>(child).layoutIfNeeded();
>         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;

Actions: View | Formatted Diff | Diff

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