Changeset 286952 in webkit

Timestamp:

Dec 13, 2021, 9:19:12 AM (5 years ago)

Author:

svillar@igalia.com

Message:

[css-writing-modes] Use the correct margins in computeInlinePreferredLogicalWidths in orthogonal flows
​https://bugs.webkit.org/show_bug.cgi?id=233562
<rdar://problem/86105904>

Reviewed by Rob Buis.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins-expected.html: Added.
• web-platform-tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html: Added.

Source/WebCore:

In order to compute the preferred logical width of an inline element we must compute the preferred widths of
its children. More precisely we should compute the intrinsic size of the children in the inline direction of the
inline element. For parallel flows this means indeed computing the preferred logical width. Translated to
the margins, we should compute the margin-start and margin-end of each child.

However for orthogonal writing modes we should not use the margin-start & margin-end but margin-after and
margin-before. That's why in order to support orthogonal flows we should replace marginStart() usage by
marginStartUsing(parentStyle) (same for marginEnd).

Test: imported/w3c/web-platform-tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths const):

LayoutTests:

• TestExpectations: Unksipped a flexbox test that is now passing.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins-expected.html (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-12-13  Sergio Villar Senin  <svillar@igalia.com>
+
+        [css-writing-modes] Use the correct margins in computeInlinePreferredLogicalWidths in orthogonal flows
+        https://bugs.webkit.org/show_bug.cgi?id=233562
+        <rdar://problem/86105904>
+
+        Reviewed by Rob Buis.
+
+        * TestExpectations: Unksipped a flexbox test that is now passing.
+
 2021-12-13  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -4248 +4248 @@
 webkit.org/b/221474 imported/w3c/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-002.html [ ImageOnlyFailure ]
 
-# The test works fine but the expected result fails due to a missing layout.
-webkit.org/b/221468 imported/w3c/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-002.xhtml [ ImageOnlyFailure ]
-
 # align baseline in flexbox.
 webkit.org/b/221478 imported/w3c/web-platform-tests/css/css-flexbox/baseline-synthesis-001.html [ ImageOnlyFailure ]

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-12-13  Sergio Villar Senin  <svillar@igalia.com>
+
+        [css-writing-modes] Use the correct margins in computeInlinePreferredLogicalWidths in orthogonal flows
+        https://bugs.webkit.org/show_bug.cgi?id=233562
+        <rdar://problem/86105904>
+
+        Reviewed by Rob Buis.
+
+        * web-platform-tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins-expected.html: Added.
+        * web-platform-tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html: Added.
+
 2021-12-13  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-13  Sergio Villar Senin  <svillar@igalia.com>
+
+        [css-writing-modes] Use the correct margins in computeInlinePreferredLogicalWidths in orthogonal flows
+        https://bugs.webkit.org/show_bug.cgi?id=233562
+        <rdar://problem/86105904>
+
+        Reviewed by Rob Buis.
+
+        In order to compute the preferred logical width of an inline element we must compute the preferred widths of
+        its children. More precisely we should compute the intrinsic size of the children in the inline direction of the
+        inline element. For parallel flows this means indeed computing the preferred logical width. Translated to
+        the margins, we should compute the margin-start and margin-end of each child.
+
+        However for orthogonal writing modes we should not use the margin-start & margin-end but margin-after and
+        margin-before. That's why in order to support orthogonal flows we should replace marginStart() usage by
+        marginStartUsing(parentStyle) (same for marginEnd).
+
+        Test: imported/w3c/web-platform-tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths const):
+
 2021-12-13  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -4340 +4340 @@
                         lastText = nullptr;
                     LayoutUnit margins;
-                    Length startMargin = childStyle.marginStart();
-                    Length endMargin = childStyle.marginEnd();
+                    Length startMargin = childStyle.marginStartUsing(&style());
+                    Length endMargin = childStyle.marginEndUsing(&style());
                     if (startMargin.isFixed())
                         margins += LayoutUnit::fromFloatCeil(startMargin.value());