Changeset 74292 in webkit

Timestamp:

Dec 17, 2010 1:39:19 PM (13 years ago)

Author:

carol.szabo@nokia.com

Message:

2010-12-17 Carol Szabo <​carol.szabo@nokia.com>

Reviewed by Darin Adler.

A corrupted counter tree is created when renderers are added to the
tree bypassing RenderObject::addChild
​https://bugs.webkit.org/show_bug.cgi?id=51270

This patch replaces the hack introduced for fixing bug 43812
with code that addresses the underlying problem for that bug.
No new layout tests provided as there is no identified scenario when
visible behavior would be different, the internal datastructures
are maintained properly through this fix so the previous hack
introduced for bug 43812 is now removed. The fact that the
layout test introduced for 43812 continues to pass is proof that the
code works.

• rendering/RenderCounter.cpp: (WebCore::findPlaceForCounter): Removed hack.
• rendering/RenderObject.cpp: (WebCore::RenderObject::addChild): Moved call to counter nodes updater to lower level functions to avoid bypass.
• rendering/RenderObjectChildList.cpp: (WebCore::RenderObjectChildList::appendChildNode): (WebCore::RenderObjectChildList::insertChildNode): Changed to update the values of the counters that may be inserted in the tree.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderCounter.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderObjectChildList.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-17  Carol Szabo  <carol.szabo@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        A corrupted counter tree is created when renderers are added to the
+        tree bypassing RenderObject::addChild
+        https://bugs.webkit.org/show_bug.cgi?id=51270
+
+        This patch replaces the hack introduced for fixing bug 43812
+        with code that addresses the underlying problem for that bug.
+        No new layout tests provided as there is no identified scenario when
+        visible behavior would be different, the internal datastructures
+        are maintained properly through this fix so the previous hack
+        introduced for bug 43812 is now removed. The fact that the 
+        layout test introduced for 43812 continues to pass is proof that the
+        code works.
+
+        * rendering/RenderCounter.cpp:
+        (WebCore::findPlaceForCounter):
+          Removed hack.
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::addChild):
+          Moved call to counter nodes updater to lower level
+          functions to avoid bypass.
+        * rendering/RenderObjectChildList.cpp:
+        (WebCore::RenderObjectChildList::appendChildNode):
+        (WebCore::RenderObjectChildList::insertChildNode):
+          Changed to update the values of the counters that
+          may be inserted in the tree.
+
 2010-12-17  Shimeng (Simon) Wang  <swang@google.com>
 

trunk/WebCore/rendering/RenderCounter.cpp

@@ -137 +137 @@
     previousSibling = 0;
     while (currentRenderer) {
-        // A sibling without a parent means that the counter node tree was not constructed correctly so we stop
-        // traversing. In the future RenderCounter should handle RenderObjects that are not connected to the
-        // render tree at counter node creation. See bug 43812.
-        if (previousSibling && !previousSibling->parent())
-            return false;
         CounterNode* currentCounter = makeCounterNode(currentRenderer, identifier, false);
         if (searchEndRenderer == currentRenderer) {

trunk/WebCore/rendering/RenderObject.cpp

@@ -316 +316 @@
         children->insertChildNode(this, newChild, beforeChild);
     }
-    RenderCounter::rendererSubtreeAttached(newChild);
     if (newChild->isText() && newChild->style()->textTransform() == CAPITALIZE) {
         RefPtr<StringImpl> textToTransform = toRenderText(newChild)->originalText();

trunk/WebCore/rendering/RenderObjectChildList.cpp

@@ -175 +175 @@
     }
 
+    RenderCounter::rendererSubtreeAttached(newChild);
     newChild->setNeedsLayoutAndPrefWidthsRecalc(); // Goes up the containing block hierarchy.
     if (!owner->normalChildNeedsLayout())
@@ -234 +235 @@
     }
 
+    RenderCounter::rendererSubtreeAttached(child);
     child->setNeedsLayoutAndPrefWidthsRecalc();
     if (!owner->normalChildNeedsLayout())