Changeset 125940 in webkit

Timestamp:

Aug 17, 2012 2:59:08 PM (12 years ago)

Author:

jchaffraix@webkit.org

Message:

Introduce a will-be-removed-from-tree notification in RenderObject
​https://bugs.webkit.org/show_bug.cgi?id=94271

Reviewed by Abhishek Arya.

Following bug 93874, we have an insertion notification. This change adds the
matching removal notification (willBeRemovedFromTree).

Refactoring covered by existing tests.

• rendering/RenderObjectChildList.cpp:

(WebCore::RenderObjectChildList::removeChildNode):
Removed the code from here and moved it below.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::willBeRemovedFromTree):

• rendering/RenderObject.h:

This is the base function that should be called by every instance.

• rendering/RenderListItem.cpp:

(WebCore::RenderListItem::willBeRemovedFromTree):

• rendering/RenderListItem.h:
• rendering/RenderQuote.cpp:

(WebCore::RenderQuote::willBeRemovedFromTree):

• rendering/RenderQuote.h:
• rendering/RenderRegion.cpp:

(WebCore::RenderRegion::willBeRemovedFromTree):

• rendering/RenderRegion.h:

Overriden functions.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderListItem.cpp (modified) (1 diff)
• rendering/RenderListItem.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderObjectChildList.cpp (modified) (3 diffs)
• rendering/RenderObjectChildList.h (modified) (1 diff)
• rendering/RenderQuote.cpp (modified) (1 diff)
• rendering/RenderQuote.h (modified) (1 diff)
• rendering/RenderRegion.cpp (modified) (1 diff)
• rendering/RenderRegion.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-17  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Introduce a will-be-removed-from-tree notification in RenderObject
+        https://bugs.webkit.org/show_bug.cgi?id=94271
+
+        Reviewed by Abhishek Arya.
+
+        Following bug 93874, we have an insertion notification. This change adds the
+        matching removal notification (willBeRemovedFromTree).
+
+        Refactoring covered by existing tests.
+
+        * rendering/RenderObjectChildList.cpp:
+        (WebCore::RenderObjectChildList::removeChildNode):
+        Removed the code from here and moved it below.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::willBeRemovedFromTree):
+        * rendering/RenderObject.h:
+        This is the base function that should be called by every instance.
+
+        * rendering/RenderListItem.cpp:
+        (WebCore::RenderListItem::willBeRemovedFromTree):
+        * rendering/RenderListItem.h:
+        * rendering/RenderQuote.cpp:
+        (WebCore::RenderQuote::willBeRemovedFromTree):
+        * rendering/RenderQuote.h:
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::willBeRemovedFromTree):
+        * rendering/RenderRegion.h:
+        Overriden functions.
+
 2012-08-17  Brian Anderson  <brianderson@chromium.org>
 

trunk/Source/WebCore/rendering/RenderListItem.cpp

@@ -80 +80 @@
 {
     RenderBlock::insertedIntoTree();
+
+    updateListMarkerNumbers();
+}
+
+void RenderListItem::willBeRemovedFromTree()
+{
+    RenderBlock::willBeRemovedFromTree();
 
     updateListMarkerNumbers();

trunk/Source/WebCore/rendering/RenderListItem.h

@@ -60 +60 @@
 
     virtual void insertedIntoTree() OVERRIDE;
+    virtual void willBeRemovedFromTree() OVERRIDE;
 
     virtual bool isEmpty() const;

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -2396 +2396 @@
 }
 
+void RenderObject::willBeRemovedFromTree()
+{
+    ASSERT(isRooted());
+
+    // If we remove a visible child from an invisible parent, we don't know the layer visibility any more.
+    RenderLayer* layer = 0;
+    if (parent()->style()->visibility() != VISIBLE && style()->visibility() == VISIBLE && !hasLayer()) {
+        if ((layer = parent()->enclosingLayer()))
+            layer->dirtyVisibleContentStatus();
+    }
+
+    // Keep our layer hierarchy updated.
+    if (firstChild() || hasLayer()) {
+        if (!layer)
+            layer = parent()->enclosingLayer();
+        removeLayers(layer);
+    }
+
+    if (isOutOfFlowPositioned() && parent()->childrenInline())
+        parent()->dirtyLinesFromChangedChild(this);
+
+    if (inRenderFlowThread()) {
+        if (isBox())
+            enclosingRenderFlowThread()->removeRenderBoxRegionInfo(toRenderBox(this));
+        enclosingRenderFlowThread()->clearRenderObjectCustomStyle(this);
+    }
+
+    if (RenderNamedFlowThread* containerFlowThread = parent()->enclosingRenderNamedFlowThread())
+        containerFlowThread->removeFlowChild(this);
+
+#if ENABLE(SVG)
+    // Update cached boundaries in SVG renderers, if a child is removed.
+    parent()->setNeedsBoundariesUpdate();
+#endif
+}
+
 void RenderObject::destroyAndCleanupAnonymousWrappers()
 {

trunk/Source/WebCore/rendering/RenderObject.h

@@ -940 +940 @@
 
     virtual void insertedIntoTree();
+    virtual void willBeRemovedFromTree();
 
 private:

trunk/Source/WebCore/rendering/RenderObjectChildList.cpp

@@ -64 +64 @@
 }
 
-RenderObject* RenderObjectChildList::removeChildNode(RenderObject* owner, RenderObject* oldChild, bool fullRemove)
+RenderObject* RenderObjectChildList::removeChildNode(RenderObject* owner, RenderObject* oldChild, bool notifyRenderer)
 {
     ASSERT(oldChild->parent() == owner);
@@ -74 +74 @@
     // that a positioned child got yanked).  We also repaint, so that the area exposed when the child
     // disappears gets repainted properly.
-    if (!owner->documentBeingDestroyed() && fullRemove && oldChild->everHadLayout()) {
+    if (!owner->documentBeingDestroyed() && notifyRenderer && oldChild->everHadLayout()) {
         oldChild->setNeedsLayoutAndPrefWidthsRecalc();
         if (oldChild->isBody())
@@ -86 +86 @@
         toRenderBox(oldChild)->deleteLineBoxWrapper();
 
-    if (!owner->documentBeingDestroyed() && fullRemove) {
-        // if we remove visible child from an invisible parent, we don't know the layer visibility any more
-        RenderLayer* layer = 0;
-        if (owner->style()->visibility() != VISIBLE && oldChild->style()->visibility() == VISIBLE && !oldChild->hasLayer()) {
-            if ((layer = owner->enclosingLayer()))
-                layer->dirtyVisibleContentStatus();
-        }
-
-         // Keep our layer hierarchy updated.
-        if (oldChild->firstChild() || oldChild->hasLayer()) {
-            if (!layer)
-                layer = owner->enclosingLayer();
-            oldChild->removeLayers(layer);
-        }
-
-        if (oldChild->isListItem())
-            toRenderListItem(oldChild)->updateListMarkerNumbers();
-
-        if (oldChild->isOutOfFlowPositioned() && owner->childrenInline())
-            owner->dirtyLinesFromChangedChild(oldChild);
-
-        if (oldChild->isRenderRegion())
-            toRenderRegion(oldChild)->detachRegion();
-
-        if (oldChild->isQuote())
-            toRenderQuote(oldChild)->detachQuote();
-
-        if (oldChild->inRenderFlowThread()) {
-            if (oldChild->isBox())
-                oldChild->enclosingRenderFlowThread()->removeRenderBoxRegionInfo(toRenderBox(oldChild));
-            oldChild->enclosingRenderFlowThread()->clearRenderObjectCustomStyle(oldChild);
-        }
-
-        if (RenderNamedFlowThread* containerFlowThread = owner->enclosingRenderNamedFlowThread())
-            containerFlowThread->removeFlowChild(oldChild);
-
-#if ENABLE(SVG)
-        // Update cached boundaries in SVG renderers, if a child is removed.
-        owner->setNeedsBoundariesUpdate();
-#endif
-    }
+    if (!owner->documentBeingDestroyed() && notifyRenderer)
+        oldChild->willBeRemovedFromTree();
     
     // If oldChild is the start or end of the selection, then clear the selection to

trunk/Source/WebCore/rendering/RenderObjectChildList.h

@@ -53 +53 @@
     void destroyLeftoverChildren();
 
-    RenderObject* removeChildNode(RenderObject* owner, RenderObject*, bool fullRemove = true);
+    RenderObject* removeChildNode(RenderObject* owner, RenderObject*, bool notifyRenderer = true);
     void appendChildNode(RenderObject* owner, RenderObject*, bool notifyRenderer = true);
     void insertChildNode(RenderObject* owner, RenderObject* child, RenderObject* before, bool notifyRenderer = true);

trunk/Source/WebCore/rendering/RenderQuote.cpp

@@ -49 +49 @@
     detachQuote();
     RenderText::willBeDestroyed();
+}
+
+void RenderQuote::willBeRemovedFromTree()
+{
+    RenderText::willBeRemovedFromTree();
+
+    detachQuote();
 }
 

trunk/Source/WebCore/rendering/RenderQuote.h

@@ -50 +50 @@
     // is called on an attached tree, we should override it here.
 
+    virtual void willBeRemovedFromTree() OVERRIDE;
+
     const QuotesData* quotesData() const;
     void updateDepth();

trunk/Source/WebCore/rendering/RenderRegion.cpp

@@ -365 +365 @@
 }
 
+void RenderRegion::willBeRemovedFromTree()
+{
+    RenderReplaced::willBeRemovedFromTree();
+
+    detachRegion();
+}
+
 PassRefPtr<RenderStyle> RenderRegion::computeStyleInRegion(const RenderObject* object)
 {

trunk/Source/WebCore/rendering/RenderRegion.h

@@ -102 +102 @@
 
     virtual void insertedIntoTree() OVERRIDE;
+    virtual void willBeRemovedFromTree() OVERRIDE;
 
     PassRefPtr<RenderStyle> computeStyleInRegion(const RenderObject*);