Attachment 422811 Details for Bug 222357 – Patch

[patch] Patch

bug-222357-20210310120008.patch (text/plain), 4.77 KB, created by Rob Buis on 2021-03-10 03:00:09 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2021-03-10 03:00:09 PST

Size: 4.77 KB

patch

obsolete

>Subversion Revision: 274203
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8a63125df1434771006de4722b51c7b6b281269b..062940bc1308f9802a001255f1d72067856c33a7 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2021-03-10  Rob Buis  <rbuis@igalia.com>
>+
>+        Fix flex-aspect-ratio-025+26.html
>+        https://bugs.webkit.org/show_bug.cgi?id=222357
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make computeMainSizeFromAspectRatioUsing take into account
>+        box-sizing for the case where CSS aspect-ratio is applied.
>+
>+        * rendering/RenderFlexibleBox.cpp:
>+        (WebCore::RenderFlexibleBox::computeMainSizeFromAspectRatioUsing const):
>+
> 2021-03-10  Tim Horton  <timothy_horton@apple.com>
> 
>         Release assertion failures under Editor::scanSelectionForTelephoneNumbers
>diff --git a/Source/WebCore/rendering/RenderFlexibleBox.cpp b/Source/WebCore/rendering/RenderFlexibleBox.cpp
>index 9bc6362639fe12d5f4920ed87c26a59ea54ec0f1..53e1f8fcd9f189ae80be234ca012e30ede937d9a 100644
>--- a/Source/WebCore/rendering/RenderFlexibleBox.cpp
>+++ b/Source/WebCore/rendering/RenderFlexibleBox.cpp
>@@ -790,9 +790,7 @@ LayoutUnit RenderFlexibleBox::computeMainSizeFromAspectRatioUsing(const RenderBo
> {
>     ASSERT(childHasAspectRatio(child));
> 
>-    auto adjustForBoxSizing = [this] (const RenderBox& box, Length length) -> LayoutUnit {
>-        ASSERT(length.isFixed());
>-        auto value = LayoutUnit(length.value());
>+    auto adjustForBoxSizing = [this] (const RenderBox& box, LayoutUnit value) -> LayoutUnit {
>         // 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.
>@@ -801,9 +799,11 @@ LayoutUnit RenderFlexibleBox::computeMainSizeFromAspectRatioUsing(const RenderBo
>         return value;
>     };
> 
>-    Optional<LayoutUnit> crossSize;
>+    // crossSize is border-box size if box-sizing is border-box, and
>+    // content-box otherwise.
>+    LayoutUnit crossSize;
>     if (crossSizeLength.isFixed())
>-        crossSize = adjustForBoxSizing(child, crossSizeLength);
>+        crossSize = LayoutUnit(crossSizeLength.value());
>     else if (crossSizeLength.isAuto()) {
>         ASSERT(childCrossSizeShouldUseContainerCrossSize(child));
>         auto containerCrossSizeLength = isHorizontalFlow() ? style().height() : style().width();
>@@ -812,22 +812,29 @@ LayoutUnit RenderFlexibleBox::computeMainSizeFromAspectRatioUsing(const RenderBo
>         crossSize = valueForLength(containerCrossSizeLength, -1_lu);
>     } else {
>         ASSERT(crossSizeLength.isPercentOrCalculated());
>-        crossSize = mainAxisIsChildInlineAxis(child) ? child.computePercentageLogicalHeight(crossSizeLength) : adjustBorderBoxLogicalWidthForBoxSizing(valueForLength(crossSizeLength, contentWidth()), crossSizeLength.type());
>-        if (!crossSize)
>+        Optional<LayoutUnit> childSize = mainAxisIsChildInlineAxis(child) ? child.computePercentageLogicalHeight(crossSizeLength) : adjustBorderBoxLogicalWidthForBoxSizing(valueForLength(crossSizeLength, contentWidth()), crossSizeLength.type());
>+        if (!childSize)
>             return 0_lu;
>+        crossSize = childSize.value();
>     }
> 
>     const LayoutSize& childIntrinsicSize = child.intrinsicSize();
>     double ratio;
>-    if (child.style().aspectRatioType() == AspectRatioType::Ratio || (child.style().aspectRatioType() == AspectRatioType::AutoAndRatio && childIntrinsicSize.isEmpty()))
>+    LayoutUnit borderAndPadding;
>+    if (child.style().aspectRatioType() == AspectRatioType::Ratio || (child.style().aspectRatioType() == AspectRatioType::AutoAndRatio && childIntrinsicSize.isEmpty())) {
>         ratio = child.style().aspectRatioWidth() / child.style().aspectRatioHeight();
>-    else {
>+        if (child.style().boxSizingForAspectRatio() == BoxSizing::ContentBox)
>+            crossSize -= isHorizontalFlow() ? child.verticalBorderAndPaddingExtent() : child.horizontalBorderAndPaddingExtent();
>+        else
>+            borderAndPadding = isHorizontalFlow() ? child.horizontalBorderAndPaddingExtent() : child.verticalBorderAndPaddingExtent();
>+    } else {
>         ASSERT(childIntrinsicSize.height());
>         ratio = childIntrinsicSize.width().toFloat() / childIntrinsicSize.height().toFloat();
>+        crossSize = adjustForBoxSizing(child, crossSize);
>     }
>     if (isHorizontalFlow())
>-        return LayoutUnit(crossSize.value() * ratio);
>-    return LayoutUnit(crossSize.value() / ratio);
>+        return LayoutUnit(crossSize * ratio) - borderAndPadding;
>+    return LayoutUnit(crossSize / ratio) - borderAndPadding;
> }
> 
> void RenderFlexibleBox::setFlowAwareLocationForChild(RenderBox& child, const LayoutPoint& location)

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