Revert "Cherry-pick 809b95b. rdar://problem/108327029"

This reverts commit fe8bf73. Identifier: 259548.719@safari-7615-branch
WebKit · May 1, 2023 · 4c34d7b · 4c34d7b
1 parent 4b11fc9
commit 4c34d7b
Show file tree

Hide file tree

Showing 3 changed files with 128 additions and 36 deletions.
diff --git a/...ox/margin-trim/computed-margin-values/block-container-block-end-nested-child-expected.txt b/...ox/margin-trim/computed-margin-values/block-container-block-end-nested-child-expected.txt
@@ -1,13 +1,46 @@
 
 PASS item 1
-PASS item 2
+FAIL item 2 assert_equals:
+<item data-expected-margin-bottom="0" style="block-size: auto;">
+                <div><item data-expected-margin-bottom="10"></item></div>
+                <div>
+                    <item data-expected-margin-bottom="0" style="block-size: auto;">
+                        <div><item data-expected-margin-bottom="0"></item></div>
+                    </item>
+                    <item class="collapsed" data-expected-margin-bottom="0">
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    </item>
+                </div>
+                <item class="collapsed" data-expected-margin-bottom="0">
+                    <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                </item>
+            </item>
+margin-bottom expected "0" but got "10"
 PASS item 3
 PASS item 4
 PASS item 5
-PASS item 6
-PASS item 7
-PASS item 8
-PASS item 9
-PASS item 10
-PASS item 11
+FAIL item 6 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0">
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    </item>
+margin-bottom expected "0" but got "10"
+FAIL item 7 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0"></item>
+margin-bottom expected "0" but got "10"
+FAIL item 8 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0">
+                    <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                </item>
+margin-bottom expected "0" but got "10"
+FAIL item 9 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0"></item>
+margin-bottom expected "0" but got "10"
+FAIL item 10 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0">
+                <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+            </item>
+margin-bottom expected "0" but got "10"
+FAIL item 11 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0"></item>
+margin-bottom expected "0" but got "10"
 
diff --git a/...mputed-margin-values/block-container-block-end-with-self-collapsing-children-expected.txt b/...mputed-margin-values/block-container-block-end-with-self-collapsing-children-expected.txt
@@ -1,20 +1,93 @@
 
 PASS item 1
 PASS item 2
-PASS item 3
-PASS item 4
-PASS item 5
-PASS item 6
-PASS item 7
-PASS item 8
-PASS item 9
-PASS item 10
-PASS item 11
-PASS item 12
-PASS item 13
-PASS item 14
-PASS item 15
-PASS item 16
-PASS item 17
+FAIL item 3 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0">
+                <div><item class="collapsed" data-expected-margin-bottom="0">
+                    <div><item class="collapsed" data-expected-margin-bottom="0">
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    </item></div>
+                </item></div>
+                <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+            </item>
+margin-bottom expected "0" but got "10"
+FAIL item 4 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0">
+                    <div><item class="collapsed" data-expected-margin-bottom="0">
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    </item></div>
+                </item>
+margin-bottom expected "0" but got "10"
+FAIL item 5 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0">
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    </item>
+margin-bottom expected "0" but got "10"
+FAIL item 6 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0"></item>
+margin-bottom expected "0" but got "10"
+FAIL item 7 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0"></item>
+margin-bottom expected "0" but got "10"
+FAIL item 8 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0"></item>
+margin-bottom expected "0" but got "10"
+FAIL item 9 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0">
+                <div><item class="collapsed" data-expected-margin-bottom="0">
+                    <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    <div><item class="collapsed" data-expected-margin-bottom="0">
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    </item></div>
+                    <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                </item></div>
+                <div><item class="collapsed" data-expected-margin-bottom="0">
+                    <div><item class="collapsed" data-expected-margin-bottom="0">
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    </item></div>
+                </item></div>
+            </item>
+margin-bottom expected "0" but got "10"
+FAIL item 10 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0">
+                    <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    <div><item class="collapsed" data-expected-margin-bottom="0">
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    </item></div>
+                    <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                </item>
+margin-bottom expected "0" but got "10"
+FAIL item 11 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0"></item>
+margin-bottom expected "0" but got "10"
+FAIL item 12 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0">
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    </item>
+margin-bottom expected "0" but got "10"
+FAIL item 13 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0"></item>
+margin-bottom expected "0" but got "10"
+FAIL item 14 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0"></item>
+margin-bottom expected "0" but got "10"
+FAIL item 15 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0">
+                    <div><item class="collapsed" data-expected-margin-bottom="0">
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    </item></div>
+                </item>
+margin-bottom expected "0" but got "10"
+FAIL item 16 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0">
+                        <div><item class="collapsed" data-expected-margin-bottom="0"></item></div>
+                    </item>
+margin-bottom expected "0" but got "10"
+FAIL item 17 assert_equals:
+<item class="collapsed" data-expected-margin-bottom="0"></item>
+margin-bottom expected "0" but got "10"
 PASS item 18
 
diff --git a/Source/WebCore/rendering/RenderBlockFlow.cpp b/Source/WebCore/rendering/RenderBlockFlow.cpp
@@ -846,14 +846,6 @@ void RenderBlockFlow::layoutBlockChildren(bool relayoutChildren, LayoutUnit& max
 
 void RenderBlockFlow::trimBlockEndChildrenMargins()
 {
-    auto trimSelfCollapsingChildDescendants = [&](RenderBox& child) {
-        ASSERT(child.isSelfCollapsingBlock());
-        for (auto itr = RenderIterator<RenderBox>(&child, child.firstChildBox()); itr; itr = itr.traverseNext()) {
-            setTrimmedMarginForChild(*itr, MarginTrimType::BlockStart);
-            setTrimmedMarginForChild(*itr, MarginTrimType::BlockEnd);
-        }
-    };
-
     ASSERT(style().marginTrim().contains(MarginTrimType::BlockEnd));
     // If we are trimming the block end margin, we need to make sure we trim the margin of the children
     // at the end of the block by walking back up the container. Any self collapsing children will also need to
@@ -870,12 +862,6 @@ void RenderBlockFlow::trimBlockEndChildrenMargins()
         if (child->isSelfCollapsingBlock()) {
             setTrimmedMarginForChild(*child, MarginTrimType::BlockStart);
             childContainingBlock->setLogicalTopForChild(*child, childContainingBlock->logicalHeight());
-
-            // If this self-collapsing child has any other children, which must also be
-            // self-collapsing, we should trim the margins of all its descendants
-            if (child->firstChildBox() && !child->childrenInline())
-                trimSelfCollapsingChildDescendants(*child);
-
             child = child->previousSiblingBox();
         }  else if (auto* nestedBlock = dynamicDowncast<RenderBlockFlow>(child); nestedBlock && nestedBlock->isBlockContainer() && !nestedBlock->childrenInline() && !nestedBlock->style().marginTrim().contains(MarginTrimType::BlockEnd)) {
             MarginInfo nestedBlockMarginInfo(*nestedBlock, nestedBlock->borderAndPaddingBefore(), nestedBlock->borderAndPaddingAfter());