Changeset 275059 in webkit

Timestamp:

Mar 25, 2021, 2:45:05 PM (5 years ago)

Author:

Cameron McCormack

Message:

Collapse newly adjacent anonymous table cells when a table cell is detached from between them.
​https://bugs.webkit.org/show_bug.cgi?id=220934

Reviewed by Zalan Bujtas.

Source/WebCore:

We already had support for collapsing newly adjacent table row cells when a
table row cell is detached from between them. We need to do this for anonymous
table cells too.

Test: fast/table/table-anonymous-cell-collapse.html

• rendering/updating/RenderTreeBuilder.cpp:

(WebCore::RenderTreeBuilder::destroyAndCleanUpAnonymousWrappers): Call
into the RenderTreeBuilder::Table to collapse anonymous table cells when
needed.

• rendering/updating/RenderTreeBuilderTable.cpp:

(WebCore::RenderTreeBuilder::Table::collapseAndDestroyAnonymousSiblings):
Factor out the existing collapseAndDestroyAnonymousSiblingRows into
something re-usable.
(WebCore::RenderTreeBuilder::Table::collapseAndDestroyAnonymousSiblingCells):
Added.
(WebCore::RenderTreeBuilder::Table::collapseAndDestroyAnonymousSiblingRows):
Factored out to collapseAndDestroyAnonymousSiblings.

• rendering/updating/RenderTreeBuilderTable.h:

LayoutTests:

• fast/table/table-anonymous-cell-collapse-expected.html: Added.
• fast/table/table-anonymous-cell-collapse.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/table-anonymous-cell-collapse-expected.html (added)
• LayoutTests/fast/table/table-anonymous-cell-collapse.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/updating/RenderTreeBuilder.cpp (modified) (2 diffs)
• Source/WebCore/rendering/updating/RenderTreeBuilderTable.cpp (modified) (1 diff)
• Source/WebCore/rendering/updating/RenderTreeBuilderTable.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-03-25  Cameron McCormack  <heycam@apple.com>
+
+        Collapse newly adjacent anonymous table cells when a table cell is detached from between them.
+        https://bugs.webkit.org/show_bug.cgi?id=220934
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/table/table-anonymous-cell-collapse-expected.html: Added.
+        * fast/table/table-anonymous-cell-collapse.html: Added.
+
 2021-03-25  Tim Nguyen  <ntim@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-25  Cameron McCormack  <heycam@apple.com>
+
+        Collapse newly adjacent anonymous table cells when a table cell is detached from between them.
+        https://bugs.webkit.org/show_bug.cgi?id=220934
+
+        Reviewed by Zalan Bujtas.
+
+        We already had support for collapsing newly adjacent table row cells when a
+        table row cell is detached from between them.  We need to do this for anonymous
+        table cells too.
+
+        Test: fast/table/table-anonymous-cell-collapse.html
+
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::destroyAndCleanUpAnonymousWrappers): Call
+        into the RenderTreeBuilder::Table to collapse anonymous table cells when
+        needed.
+        * rendering/updating/RenderTreeBuilderTable.cpp:
+        (WebCore::RenderTreeBuilder::Table::collapseAndDestroyAnonymousSiblings):
+        Factor out the existing collapseAndDestroyAnonymousSiblingRows into
+        something re-usable.
+        (WebCore::RenderTreeBuilder::Table::collapseAndDestroyAnonymousSiblingCells):
+        Added.
+        (WebCore::RenderTreeBuilder::Table::collapseAndDestroyAnonymousSiblingRows):
+        Factored out to collapseAndDestroyAnonymousSiblings.
+        * rendering/updating/RenderTreeBuilderTable.h:
+
 2021-03-25  Tim Nguyen  <ntim@apple.com>
 

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

@@ -52 +52 @@
 #include "RenderSVGText.h"
 #include "RenderTable.h"
+#include "RenderTableCell.h"
 #include "RenderTableRow.h"
 #include "RenderTableSection.h"
@@ -827 +828 @@
     clearFloatsAndOutOfFlowPositionedObjects();
 
-    if (is<RenderTableRow>(destroyRoot))
-        tableBuilder().collapseAndDestroyAnonymousSiblingRows(downcast<RenderTableRow>(destroyRoot));
+    auto collapseAndDestroyAnonymousSiblings = [&] {
+        // FIXME: Probably need to handle other table parts here as well.
+        if (is<RenderTableCell>(destroyRoot)) {
+            tableBuilder().collapseAndDestroyAnonymousSiblingCells(downcast<RenderTableCell>(destroyRoot));
+            return;
+        }
+
+        if (is<RenderTableRow>(destroyRoot)) {
+            tableBuilder().collapseAndDestroyAnonymousSiblingRows(downcast<RenderTableRow>(destroyRoot));
+            return;
+        }
+    };
+    collapseAndDestroyAnonymousSiblings();
 
     // FIXME: Do not try to collapse/cleanup the anonymous wrappers inside destroy (see webkit.org/b/186746).

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

@@ -248 +248 @@
 }
 
+template <typename Parent, typename Child>
+void RenderTreeBuilder::Table::collapseAndDestroyAnonymousSiblings(Parent* parent, Child* previousSibling, Child* nextSibling)
+{
+    if (!parent || !previousSibling || !nextSibling)
+        return;
+
+    if (previousSibling->isAnonymous() && nextSibling->isAnonymous()) {
+        m_builder.moveAllChildren(*nextSibling, *previousSibling, RenderTreeBuilder::NormalizeAfterInsertion::No);
+        auto toDestroy = m_builder.detach(*parent, *nextSibling);
+    }
+
+    previousSibling->setNeedsLayout();
+}
+
+void RenderTreeBuilder::Table::collapseAndDestroyAnonymousSiblingCells(RenderTableCell& cell)
+{
+    collapseAndDestroyAnonymousSiblings(cell.row(), cell.previousCell(), cell.nextCell());
+}
+
 void RenderTreeBuilder::Table::collapseAndDestroyAnonymousSiblingRows(RenderTableRow& row)
 {
-    auto* section = row.section();
-    if (!section)
-        return;
-
-    auto* before = row.previousRow();
-    if (!before)
-        return;
-
-    auto* after = row.nextRow();
-    if (!after)
-        return;
-
-    if (before->isAnonymous() && after->isAnonymous()) {
-        m_builder.moveAllChildren(*after, *before, RenderTreeBuilder::NormalizeAfterInsertion::No);
-        auto toDestroy = m_builder.detach(*section, *after);
-    }
-
-    before->setNeedsLayout();
-}
-
-}
+    collapseAndDestroyAnonymousSiblings(row.section(), row.previousRow(), row.nextRow());
+}
+
+}

trunk/Source/WebCore/rendering/updating/RenderTreeBuilderTable.h

@@ -33 +33 @@
 class RenderObject;
 class RenderTable;
+class RenderTableCell;
 class RenderTableSection;
 class RenderTableRow;
@@ -52 +53 @@
     bool childRequiresTable(const RenderElement& parent, const RenderObject& child);
 
+    void collapseAndDestroyAnonymousSiblingCells(RenderTableCell&);
     void collapseAndDestroyAnonymousSiblingRows(RenderTableRow&);
 
 private:
+    template <typename Parent, typename Child>
+    void collapseAndDestroyAnonymousSiblings(Parent*, Child* previousChild, Child* nextChild);
+
     RenderTreeBuilder& m_builder;
 };