Changeset 290634 in webkit

Timestamp:

Mar 1, 2022 12:55:07 AM (5 months ago)

Author:

Matt Woodrow

Message:

Handle perpendicular containing blocks when computing available logical height.
​https://bugs.webkit.org/show_bug.cgi?id=236953

Reviewed by Dean Jackson.

Source/WebCore:

Handles the case where the containing block uses a perpendicular writing mode
to the current box, and we need to check the containing block's width in order
to determine height.

Existing subgrid tests marked as passing.
These subgrid reftests were failing because the -expected files were rendering incorrectly
(which don't use subgrid).

• rendering/RenderBox.cpp:

(WebCore::RenderBox::availableLogicalHeightUsing const):

LayoutTests:

• TestExpectations:

Existing subgrid tests marked as passing.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-03-01  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Handle perpendicular containing blocks when computing available logical height.
+        https://bugs.webkit.org/show_bug.cgi?id=236953
+
+        Reviewed by Dean Jackson.
+
+        * TestExpectations:
+
+        Existing subgrid tests marked as passing.
+
 2022-03-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -1401 +1401 @@
 webkit.org/b/236956 imported/w3c/web-platform-tests/css/css-grid/subgrid/grid-gap-003.html [ ImageOnlyFailure ]
 webkit.org/b/236957 imported/w3c/web-platform-tests/css/css-grid/subgrid/line-names-007.html [ ImageOnlyFailure ]
-webkit.org/b/236953 imported/w3c/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-002.html [ ImageOnlyFailure ]
-webkit.org/b/236953 imported/w3c/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-004.html [ ImageOnlyFailure ]
 webkit.org/b/236958 imported/w3c/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-003.html [ ImageOnlyFailure ]
 webkit.org/b/236949 imported/w3c/web-platform-tests/css/css-grid/subgrid/subgrid-mbp-overflow-001.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-01  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Handle perpendicular containing blocks when computing available logical height.
+        https://bugs.webkit.org/show_bug.cgi?id=236953
+
+        Reviewed by Dean Jackson.
+
+        Handles the case where the containing block uses a perpendicular writing mode
+        to the current box, and we need to check the containing block's width in order
+        to determine height.
+
+        Existing subgrid tests marked as passing.
+        These subgrid reftests were failing because the -expected files were rendering incorrectly
+        (which don't use subgrid).
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::availableLogicalHeightUsing const):
+
 2022-03-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3601 +3601 @@
 }
 
+// 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
 {
@@ -3635 +3641 @@
     }
 
-    // FIXME: This is wrong if the containingBlock has a perpendicular writing mode.
-    LayoutUnit availableHeight = containingBlockLogicalHeightForContent(heightType);
+    LayoutUnit availableHeight = isOrthogonal(*this, *containingBlock()) ? containingBlockLogicalWidthForContent() : containingBlockLogicalHeightForContent(heightType);
     if (heightType == ExcludeMarginBorderPadding) {
         // FIXME: Margin collapsing hasn't happened yet, so this incorrectly removes collapsed margins.
@@ -3778 +3783 @@
     heightResult -= (containingBlock.borderBefore() + containingBlock.borderAfter());
     return heightResult;
-}
-
-// 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();
 }