Changeset 284773 in webkit

Timestamp:

Oct 25, 2021 1:35:23 AM (9 months ago)

Author:

Ziran Sun

Message:

[css-writing-modes] Fix sizing of orthogonal elements with percentage margins
​https://bugs.webkit.org/show_bug.cgi?id=231951

Reviewed by Manuel Rego Casasnovas.
Source/WebCore:

This is to modify RenderBox::FillAvailableMeasure() to handle the case of
orthogonal elements when computing the margins. Spec reference is at
​https://www.w3.org/TR/css-writing-modes-3/#dimension-mapping

The change is an import of Chromium CL at
​https://chromium-review.googlesource.com/c/chromium/src/+/968522/

• rendering/RenderBox.cpp:

(WebCore::RenderBox::fillAvailableMeasure const):

LayoutTests:

• TestExpectations: Unskipped 8 tests that are now 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) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-25  Ziran Sun  <zsun@igalia.com>
+
+        [css-writing-modes] Fix sizing of orthogonal elements with percentage margins
+        https://bugs.webkit.org/show_bug.cgi?id=231951
+
+        Reviewed by Manuel Rego Casasnovas.
+        
+        * TestExpectations: Unskipped 8 tests that are now passing.
+
 2021-10-24  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -4230 +4230 @@
 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-004.xht [ ImageOnlyFailure ]
 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-008.xht [ ImageOnlyFailure ]
-webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-001.html [ ImageOnlyFailure ]
-webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-002.html [ ImageOnlyFailure ]
-webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-003.html [ ImageOnlyFailure ]
-webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-004.html [ ImageOnlyFailure ]
-webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-005.html [ ImageOnlyFailure ]
-webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-006.html [ ImageOnlyFailure ]
-webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-007.html [ ImageOnlyFailure ]
-webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-008.html [ ImageOnlyFailure ]
 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/table-cell-001.html [ ImageOnlyFailure ]
 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/table-cell-002.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-25  Ziran Sun  <zsun@igalia.com>
+
+        [css-writing-modes] Fix sizing of orthogonal elements with percentage margins
+        https://bugs.webkit.org/show_bug.cgi?id=231951
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        This is to modify RenderBox::FillAvailableMeasure() to handle the case of
+        orthogonal elements when computing the margins. Spec reference is at        
+        https://www.w3.org/TR/css-writing-modes-3/#dimension-mapping
+
+        The change is an import of Chromium CL at
+        https://chromium-review.googlesource.com/c/chromium/src/+/968522/        
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::fillAvailableMeasure const):
+
 2021-10-24  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2695 +2695 @@
 LayoutUnit RenderBox::fillAvailableMeasure(LayoutUnit availableLogicalWidth, LayoutUnit& marginStart, LayoutUnit& marginEnd) const
 {
-    marginStart = minimumValueForLength(style().marginStart(), availableLogicalWidth);
-    marginEnd = minimumValueForLength(style().marginEnd(), availableLogicalWidth);
+    bool isOrthogonalElement = isHorizontalWritingMode() != containingBlock()->isHorizontalWritingMode();
+    LayoutUnit availableSizeForResolvingMargin = isOrthogonalElement ? containingBlockLogicalWidthForContent() : availableLogicalWidth;
+    marginStart = minimumValueForLength(style().marginStart(), availableSizeForResolvingMargin);
+    marginEnd = minimumValueForLength(style().marginEnd(), availableSizeForResolvingMargin);
     return availableLogicalWidth - marginStart - marginEnd;
 }