Changeset 295094 in webkit

Timestamp:

Jun 1, 2022 10:26:14 AM (2 years ago)

Author:

Alan Bujtas

Message:

Spacing after some posts is too large on Dead by Daylight forums
​https://bugs.webkit.org/show_bug.cgi?id=241104
<rdar://88110302>

Reviewed by Antti Koivisto.

Do not cross containing block boundary while resolving fill-available. If the containing block does not specify the constraint value for the fill-available descendant, we should just return "can't resolve" instead of climbing the containing block tree and potentially hit the ICB as the first container with fixed height(width).

• LayoutTests/fast/block/fill-available-with-no-specified-containing-block-height-expected.html: Added.
• LayoutTests/fast/block/fill-available-with-no-specified-containing-block-height.html: Added.
• Source/WebCore/rendering/RenderBox.cpp:

(WebCore::isOrthogonal):
(WebCore::RenderBox::computeIntrinsicLogicalContentHeightUsing const):

Canonical link: ​https://commits.webkit.org/251189@main

Location:

trunk

Files:

• LayoutTests/fast/block/fill-available-with-no-specified-containing-block-height-expected.html (added)
• LayoutTests/fast/block/fill-available-with-no-specified-containing-block-height.html (added)
• Source/WebCore/rendering/RenderBox.cpp (modified) (5 diffs)

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3260 +3260 @@
 }
 
+static inline bool isOrthogonal(const RenderBox& renderer, const RenderElement& ancestor)
+{
+    return renderer.isHorizontalWritingMode() != ancestor.isHorizontalWritingMode();
+}
+
 std::optional<LayoutUnit> RenderBox::computeIntrinsicLogicalContentHeightUsing(Length logicalHeightLength, std::optional<LayoutUnit> intrinsicContentHeight, LayoutUnit borderAndPadding) const
 {
@@ -3267 +3272 @@
         if (intrinsicContentHeight)
             return adjustIntrinsicLogicalHeightForBoxSizing(intrinsicContentHeight.value());
-        return std::nullopt;
-    }
-    if (logicalHeightLength.isFillAvailable())
-        return containingBlock()->availableLogicalHeight(ExcludeMarginBorderPadding) - borderAndPadding;
+        return { };
+    }
+    if (logicalHeightLength.isFillAvailable()) {
+        auto* containingBlock = this->containingBlock();
+
+        auto canResolveAvailableSpace = [&] {
+            // FIXME: We need to find a way to say: yes, the constraint value is set and we can resolve height against it.
+            // Until then, this is mostly just guesswork.
+            if (!containingBlock)
+                return false;
+            auto containingBlockHasSpecifiedSpace = [&] {
+                auto isOrthogonal = WebCore::isOrthogonal(*this, *containingBlock);
+                auto& style = containingBlock->style();
+                if ((!isOrthogonal && style.height().isSpecified()) || (isOrthogonal && style.width().isSpecified()))
+                    return true;
+                if (containingBlock->isOutOfFlowPositioned()) {
+                    if ((!isOrthogonal && !style.top().isAuto() && !style.bottom().isAuto()) || (isOrthogonal && !style.left().isAuto() && !style.right().isAuto()))
+                        return true;
+                }
+                return false;
+            };
+            return containingBlockHasSpecifiedSpace() || containingBlock->hasOverridingLogicalHeight();
+        };
+        if (canResolveAvailableSpace())
+            return containingBlock->availableLogicalHeight(ExcludeMarginBorderPadding) - borderAndPadding;
+        return { };
+    }
     ASSERT_NOT_REACHED();
     return 0_lu;
@@ -3631 +3659 @@
 }
 
-// FIXME: evaluate whether this should be a method of RenderObject instead.
-static inline bool isOrthogonal(const RenderObject& renderer, const RenderObject& ancestor)
-{
-    return renderer.isHorizontalWritingMode() != ancestor.isHorizontalWritingMode();
-}
-
 LayoutUnit RenderBox::availableLogicalHeightUsing(const Length& h, AvailableLogicalHeightType heightType) const
 {
@@ -3820 +3842 @@
         return;
 
-    RenderObject* parent = child->parent();
+    auto* parent = child->parent();
     TextDirection parentDirection = parent->style().direction();
 
@@ -4257 +4279 @@
         return;
     
-    RenderObject* parent = child->parent();
+    auto* parent = child->parent();
 
     // The static positions from the child's layer are relative to the container block's coordinate space (which is determined