Changeset 262061 in webkit

Timestamp:

May 22, 2020 9:45:36 AM (4 years ago)

Author:

Oriol Brufau

Message:

Don't put out-of-flow boxes in anonymous flex/grid items
​https://bugs.webkit.org/show_bug.cgi?id=205386

Reviewed by Manuel Rego Casasnovas.

Source/WebCore:

A single anonymous flex/grid item should just contain a contiguous
sequence of text runs.

This patch is based on ​https://crrev.com/533825 from Chromium.

Tests: imported/w3c/web-platform-tests/css/css-flexbox/anonymous-flex-item-004.html

imported/w3c/web-platform-tests/css/css-grid/grid-items/anonymous-grid-item-001.html

• rendering/updating/RenderTreeBuilderBlock.cpp:

(WebCore::RenderTreeBuilder::Block::attachIgnoringContinuation):

LayoutTests:

Expect tests to pass.

• TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-05-22  Oriol Brufau  <obrufau@igalia.com>
+
+        Don't put out-of-flow boxes in anonymous flex/grid items
+        https://bugs.webkit.org/show_bug.cgi?id=205386
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        Expect tests to pass.
+
+        * TestExpectations:
+
 2020-05-22  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -1060 +1060 @@
 imported/w3c/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-015.html [ Pass Failure ]
 webkit.org/b/191367 imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-002.html [ ImageOnlyFailure ]
-webkit.org/b/191460 imported/w3c/web-platform-tests/css/css-grid/grid-items/anonymous-grid-item-001.html [ Skip ]
 webkit.org/b/191461 imported/w3c/web-platform-tests/css/css-grid/grid-items/percentage-size-subitems-001.html [ ImageOnlyFailure ]
 webkit.org/b/191462 imported/w3c/web-platform-tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001.html [ ImageOnlyFailure ]
@@ -4240 +4239 @@
 webkit.org/b/210093 imported/w3c/web-platform-tests/css/css-flexbox/select-element-zero-height-002.html [ ImageOnlyFailure ]
 webkit.org/b/210102 imported/w3c/web-platform-tests/css/css-flexbox/table-as-item-auto-min-width.html [ ImageOnlyFailure ]
-webkit.org/b/210144 imported/w3c/web-platform-tests/css/css-flexbox/anonymous-flex-item-004.html [ ImageOnlyFailure ]
 webkit.org/b/210144 imported/w3c/web-platform-tests/css/css-flexbox/anonymous-flex-item-005.html [ ImageOnlyFailure ]
 webkit.org/b/210465 imported/w3c/web-platform-tests/css/css-flexbox/flex-wrap-002.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-22  Oriol Brufau  <obrufau@igalia.com>
+
+        Don't put out-of-flow boxes in anonymous flex/grid items
+        https://bugs.webkit.org/show_bug.cgi?id=205386
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        A single anonymous flex/grid item should just contain a contiguous
+        sequence of text runs.
+
+        This patch is based on https://crrev.com/533825 from Chromium.
+
+        Tests: imported/w3c/web-platform-tests/css/css-flexbox/anonymous-flex-item-004.html
+               imported/w3c/web-platform-tests/css/css-grid/grid-items/anonymous-grid-item-001.html
+
+        * rendering/updating/RenderTreeBuilderBlock.cpp:
+        (WebCore::RenderTreeBuilder::Block::attachIgnoringContinuation):
+
 2020-05-22  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp

@@ -223 +223 @@
             ASSERT(beforeChild->parent() == &parent);
         }
-    } else if (!parent.childrenInline() && (child->isFloatingOrOutOfFlowPositioned() || child->isInline())) {
+    } else if (!parent.childrenInline() && ((child->isFloatingOrOutOfFlowPositioned() && !parent.isFlexibleBox() && !parent.isRenderGrid()) || child->isInline())) {
         // If we're inserting an inline child but all of our children are blocks, then we have to make sure
         // it is put into an anomyous block box. We try to use an existing anonymous box if possible, otherwise