Changeset 207974 in webkit

Timestamp:

Oct 27, 2016, 3:06:45 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r207547 - Use anonymous table row for new child at RenderTableRow::addChild() if available.
​https://bugs.webkit.org/show_bug.cgi?id=163651
<rdar://problem/28705022>

Reviewed by David Hyatt.

Source/WebCore:

We should try to prevent the continuation siblings from getting separated and inserted into
wrapper renderers. It makes finding these continuation siblings difficult.
This patch adds a checks for anonymous table rows so that we could find a closer common ancestor of
beforeChild/new child.

Test: fast/table/crash-when-table-has-continuation-and-content-inserted.html

• rendering/RenderObject.cpp:

(WebCore::RenderObject::showRenderObject): Add continuation information.

• rendering/RenderTableRow.cpp:

(WebCore::RenderTableRow::addChild):

LayoutTests:

• fast/table/crash-when-table-has-continuation-and-content-inserted-expected.txt: Added.
• fast/table/crash-when-table-has-continuation-and-content-inserted.html: Added.

Location:

releases/WebKitGTK/webkit-2.14

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/crash-when-table-has-continuation-and-content-inserted-expected.txt (added)
• LayoutTests/fast/table/crash-when-table-has-continuation-and-content-inserted.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderTableRow.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-19  Zalan Bujtas  <zalan@apple.com>
+
+        Use anonymous table row for new child at RenderTableRow::addChild() if available.
+        https://bugs.webkit.org/show_bug.cgi?id=163651
+        <rdar://problem/28705022>
+
+        Reviewed by David Hyatt.
+
+        * fast/table/crash-when-table-has-continuation-and-content-inserted-expected.txt: Added.
+        * fast/table/crash-when-table-has-continuation-and-content-inserted.html: Added.
+
 2016-10-18  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-19  Zalan Bujtas  <zalan@apple.com>
+
+        Use anonymous table row for new child at RenderTableRow::addChild() if available.
+        https://bugs.webkit.org/show_bug.cgi?id=163651
+        <rdar://problem/28705022>
+
+        Reviewed by David Hyatt.
+
+        We should try to prevent the continuation siblings from getting separated and inserted into
+        wrapper renderers. It makes finding these continuation siblings difficult.
+        This patch adds a checks for anonymous table rows so that we could find a closer common ancestor of
+        beforeChild/new child. 
+
+        Test: fast/table/crash-when-table-has-continuation-and-content-inserted.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::showRenderObject): Add continuation information.
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::addChild):
+
 2016-10-18  Brent Fulgham  <bfulgham@apple.com>
 

releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderObject.cpp

@@ -1145 +1145 @@
         }
     }
-
+    if (is<RenderBoxModelObject>(*this)) {
+        auto& renderer = downcast<RenderBoxModelObject>(*this);
+        if (renderer.hasContinuation())
+            fprintf(stderr, " continuation->(%p)", renderer.continuation());
+    }
     showRegionsInformation();
     fprintf(stderr, "\n");

releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderTableRow.cpp

@@ -129 +129 @@
         }
 
-        // If beforeChild is inside an anonymous cell, insert into the cell.
-        if (last && !is<RenderTableCell>(*last) && last->parent() && last->parent()->isAnonymous() && !last->parent()->isBeforeOrAfterContent()) {
-            last->parent()->addChild(child, beforeChild);
-            return;
-        }
-
+        // Try to find an anonymous container for the child.
+        if (last && last->parent() && last->parent()->isAnonymous() && !last->parent()->isBeforeOrAfterContent()) {
+            // If beforeChild is inside an anonymous cell, insert into the cell.
+            if (!is<RenderTableCell>(*last)) {
+                last->parent()->addChild(child, beforeChild);
+                return;
+            }
+            // If beforeChild is inside an anonymous row, insert into the row.
+            auto& parent = *last->parent();
+            if (is<RenderTableRow>(parent)) {
+                auto* cell = RenderTableCell::createAnonymousWithParentRenderer(*this).release();
+                parent.addChild(cell, beforeChild);
+                cell->addChild(child);
+                return;
+            }
+        }
         auto* cell = RenderTableCell::createAnonymousWithParentRenderer(*this).release();
         addChild(cell, beforeChild);