Attachment 422494 Details for Bug 222357 – Patch

[patch] Patch

bug-222357-20210306173316.patch (text/plain), 5.10 KB, created by Rob Buis on 2021-03-06 08:33:17 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2021-03-06 08:33:17 PST

Size: 5.10 KB

patch

obsolete

>Subversion Revision: 273983
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1aa8ec6a7fc5f2ce78e84effcc30e4cff48b0726..e3695a4bc4de9bdde4421d75a635bcf025a51e43 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2021-03-06  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!).
>+
>+        WIP.
>+
>+        * rendering/RenderFlexibleBox.cpp:
>+        (WebCore::RenderFlexibleBox::willChildCrossSizeBeContainerCrossSize const):
>+        (WebCore::RenderFlexibleBox::computeMainSizeFromAspectRatioUsing const):
>+        * rendering/RenderFlexibleBox.h:
>+
> 2021-03-05  Simon Fraser  <simon.fraser@apple.com>
> 
>         sticky position incorrect behavior in table with dir=RTL
>diff --git a/Source/WebCore/rendering/RenderFlexibleBox.cpp b/Source/WebCore/rendering/RenderFlexibleBox.cpp
>index 9bc6362639fe12d5f4920ed87c26a59ea54ec0f1..ba8e8a776984c40971b57c2a2fb7c337b8ec10e2 100644
>--- a/Source/WebCore/rendering/RenderFlexibleBox.cpp
>+++ b/Source/WebCore/rendering/RenderFlexibleBox.cpp
>@@ -785,14 +785,17 @@ bool RenderFlexibleBox::useChildAspectRatio(const RenderBox& child) const
>     return childCrossSizeIsDefinite(child, crossSizeLengthForChild(MainOrPreferredSize, child));
> }
> 
>+bool RenderFlexibleBox::willChildCrossSizeBeContainerCrossSize(const RenderBox& child) const
>+{
>+    const Length& crossSizeLength = isHorizontalFlow() ? child.style().height() : child.style().width();
>+    return !isMultiline() && childCrossSizeIsDefinite(child, Length(100, LengthType::Percent)) && alignmentForChild(child) == ItemPosition::Stretch && crossSizeLength.isAuto() && !hasAutoMarginsInCrossAxis(child);
>+}
>     
> LayoutUnit RenderFlexibleBox::computeMainSizeFromAspectRatioUsing(const RenderBox& child, Length crossSizeLength) const
> {
>     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,18 +804,15 @@ LayoutUnit RenderFlexibleBox::computeMainSizeFromAspectRatioUsing(const RenderBo
>         return value;
>     };
> 
>+    if (crossSizeLength.isAuto() && willChildCrossSizeBeContainerCrossSize(child))
>+        crossSizeLength = Length(100, LengthType::Percent);
>+
>     Optional<LayoutUnit> crossSize;
>-    if (crossSizeLength.isFixed())
>-        crossSize = adjustForBoxSizing(child, crossSizeLength);
>-    else if (crossSizeLength.isAuto()) {
>-        ASSERT(childCrossSizeShouldUseContainerCrossSize(child));
>-        auto containerCrossSizeLength = isHorizontalFlow() ? style().height() : style().width();
>-        // Keep this sync'ed with childCrossSizeShouldUseContainerCrossSize().
>-        ASSERT(containerCrossSizeLength.isFixed());
>-        crossSize = valueForLength(containerCrossSizeLength, -1_lu);
>+    if (crossSizeLength.isFixed()) {
>+        crossSize = LayoutUnit(crossSizeLength.value());
>     } else {
>         ASSERT(crossSizeLength.isPercentOrCalculated());
>-        crossSize = mainAxisIsChildInlineAxis(child) ? child.computePercentageLogicalHeight(crossSizeLength) : adjustBorderBoxLogicalWidthForBoxSizing(valueForLength(crossSizeLength, contentWidth()), crossSizeLength.type());
>+        crossSize = mainAxisIsChildInlineAxis(child) ? child.computePercentageLogicalHeight(crossSizeLength) : valueForLength(crossSizeLength, contentWidth());
>         if (!crossSize)
>             return 0_lu;
>     }
>@@ -824,6 +824,7 @@ LayoutUnit RenderFlexibleBox::computeMainSizeFromAspectRatioUsing(const RenderBo
>     else {
>         ASSERT(childIntrinsicSize.height());
>         ratio = childIntrinsicSize.width().toFloat() / childIntrinsicSize.height().toFloat();
>+        *crossSize = adjustForBoxSizing(child, *crossSize);
>     }
>     if (isHorizontalFlow())
>         return LayoutUnit(crossSize.value() * ratio);
>diff --git a/Source/WebCore/rendering/RenderFlexibleBox.h b/Source/WebCore/rendering/RenderFlexibleBox.h
>index 680dcd7c0380472b499ad744dea21d68c7f4e949..b173e2ba5e0a6a60f579f98cf7cc93abd6136478 100644
>--- a/Source/WebCore/rendering/RenderFlexibleBox.h
>+++ b/Source/WebCore/rendering/RenderFlexibleBox.h
>@@ -142,6 +142,7 @@ private:
>     LayoutUnit crossAxisScrollbarExtent() const;
>     LayoutUnit crossAxisScrollbarExtentForChild(const RenderBox& child) const;
>     LayoutPoint flowAwareLocationForChild(const RenderBox& child) const;
>+    bool willChildCrossSizeBeContainerCrossSize(const RenderBox& child) const;
>     bool useChildAspectRatio(const RenderBox& child) const;
>     bool childCrossSizeShouldUseContainerCrossSize(const RenderBox& child) const;
>     LayoutUnit computeMainSizeFromAspectRatioUsing(const RenderBox& child, Length crossSizeLength) const;

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