Changeset 11579 in webkit

Timestamp:

Dec 13, 2005, 6:22:03 PM (19 years ago)

Author:

bdakin

Message:

Bug #:
Submitted by:
Reviewed by:

Location:

trunk/WebCore

Files:

• ChangeLog-2005-12-19 (modified) (1 diff)
• khtml/rendering/render_table.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog-2005-12-19

@@ +1 @@
+2005-12-13  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Hyatt and Darin.
+
+        Fix for <rdar://problem/4335884> REGRESSION: assertion failure 
+        after adding DOM element (render_container.cpp:365: beforeChild->
+        parent() == this).
+
+        When adding a child, tables should send the next to last box
+        instead of the last box as beforeChild because that is what
+        RenderContainer::insertChildNode() expects. RenderContainer
+        ::insertChildNode() will not recurse to the correct box for
+        tables because tables won't pass the isAnonymousBlock() check,
+        so tables must send the correct information to start with.
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addChild): Keep track of the nextToLastBox and
+        send that one to the other addChild() functions instead of the
+        lastBox.
+
 === Safari-521~5 ===
 

trunk/WebCore/khtml/rendering/render_table.cpp

@@ -141 +141 @@
             } else {
                 RenderObject *lastBox = beforeChild;
+                RenderObject *nextToLastBox = beforeChild;
                 while (lastBox && lastBox->parent()->isAnonymous() &&
-                        !lastBox->isTableSection() && lastBox->style()->display() != TABLE_CAPTION)
+                        !lastBox->isTableSection() && lastBox->style()->display() != TABLE_CAPTION) {
+                    nextToLastBox = lastBox;
                     lastBox = lastBox->parent();
+                }
                 if (lastBox && lastBox->isAnonymous()) {
-                    lastBox->addChild(child, beforeChild);
+                    lastBox->addChild(child, nextToLastBox);
                     return;
                 } else {