Attachment 427000 Details for Bug 225015 – Patch

[patch] Patch

bug-225015-20210425124315.patch (text/plain), 2.45 KB, created by Rob Buis on 2021-04-25 03:43:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2021-04-25 03:43:16 PDT

Size: 2.45 KB

patch

obsolete

>Subversion Revision: 276236
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5ef49ddb9b79d1c9062a284cc9af0a5b149788b2..b94e3094ea9a2a8867c7e6a49a870ad94840fa61 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2021-04-24  Rob Buis  <rbuis@igalia.com>
>+
>+        Block sizing is miscalculated for elements with a preferred aspect-ratio when padding is applied, and content can overflow.
>+        https://bugs.webkit.org/show_bug.cgi?id=225015
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WIP.
>+
>+        * rendering/RenderBox.cpp:
>+        (WebCore::RenderBox::computeLogicalHeight const):
>+
> 2021-04-18  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Selected image overlay text should never be visible
>diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
>index 192440b338808a03ef18c189616de9a9bbfebded..f883ca2458e158b23dc3c1d001eb3f272c2d8382 100644
>--- a/Source/WebCore/rendering/RenderBox.cpp
>+++ b/Source/WebCore/rendering/RenderBox.cpp
>@@ -2956,11 +2956,16 @@ RenderBox::LogicalExtentComputedValues RenderBox::computeLogicalHeight(LayoutUni
>             // translate this to a nullopt intrinsic height for further logical height computations.
>             Optional<LayoutUnit> intrinsicHeight;
>             if (computedValues.m_extent != LayoutUnit::max())
>-                intrinsicHeight = computedValues.m_extent - borderAndPaddingLogicalHeight();
>-            if (shouldComputeLogicalHeightFromAspectRatio())
>+                intrinsicHeight = computedValues.m_extent;
>+            if (shouldComputeLogicalHeightFromAspectRatio()) {
>+                if (intrinsicHeight && style().boxSizingForAspectRatio() == BoxSizing::ContentBox)
>+                    *intrinsicHeight -= borderAndPaddingLogicalHeight();
>                 heightResult = blockSizeFromAspectRatio(horizontalBorderAndPaddingExtent(), verticalBorderAndPaddingExtent(), LayoutUnit(style().logicalAspectRatio()), style().boxSizingForAspectRatio(), logicalWidth());
>-            else
>+            } else {
>+                if (intrinsicHeight)
>+                    *intrinsicHeight -= borderAndPaddingLogicalHeight();
>                 heightResult = computeLogicalHeightUsing(MainOrPreferredSize, style().logicalHeight(), intrinsicHeight).valueOr(computedValues.m_extent);
>+            }
>             heightResult = constrainLogicalHeightByMinMax(heightResult, intrinsicHeight);
>         } else {
>             ASSERT(h.isFixed());

Actions: View | Formatted Diff | Diff

Attachments on bug 225015: 426984 | 426997 | 427000 | 427006 | 427273