Merge r175580 - RenderBox shouldn't need a pre-destructor hook.

<https://webkit.org/b/138367> Reviewed by Antti Koivisto. Move teardown logic from willBeDestroyed() to the regular ~RenderBox() destructor since none of it depends on being in-tree or having a fully constructed vtable. * rendering/RenderBox.cpp: (WebCore::RenderBox::~RenderBox): (WebCore::RenderBox::willBeDestroyed): Deleted. * rendering/RenderBox.h: Canonical link: https://commits.webkit.org/154760.188@webkitgtk/2.6 git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@175948 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Nov 11, 2014 · 124be3e · 124be3e
1 parent cbfc4d3
commit 124be3e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 21 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2014-11-04  Andreas Kling  <akling@apple.com>
+
+        RenderBox shouldn't need a pre-destructor hook.
+        <https://webkit.org/b/138367>
+
+        Reviewed by Antti Koivisto.
+
+        Move teardown logic from willBeDestroyed() to the regular ~RenderBox()
+        destructor since none of it depends on being in-tree or having a fully
+        constructed vtable.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::~RenderBox):
+        (WebCore::RenderBox::willBeDestroyed): Deleted.
+        * rendering/RenderBox.h:
+
 2014-11-04  Andreas Kling  <akling@apple.com>
 
         RenderQuote shouldn't need a pre-destructor hook.

diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
@@ -129,6 +129,20 @@ RenderBox::RenderBox(Document& document, PassRef<RenderStyle> style, unsigned ba
 
 RenderBox::~RenderBox()
 {
+    if (frame().eventHandler().autoscrollRenderer() == this)
+        frame().eventHandler().stopAutoscrollTimer(true);
+
+    clearOverrideSize();
+#if ENABLE(CSS_GRID_LAYOUT)
+    clearContainingBlockOverrideSize();
+#endif
+
+    RenderBlock::removePercentHeightDescendantIfNeeded(*this);
+
+#if ENABLE(CSS_SHAPES)
+    ShapeOutsideInfo::removeInfo(*this);
+#endif
+
     view().unscheduleLazyRepaint(*this);
     if (hasControlStatesForRenderer(this))
         removeControlStatesForRenderer(this);
@@ -234,25 +248,6 @@ LayoutRect RenderBox::borderBoxRectInRegion(RenderRegion* region, RenderBoxRegio
     return LayoutRect(0, logicalLeft, width(), logicalWidth);
 }
 
-void RenderBox::willBeDestroyed()
-{
-    if (frame().eventHandler().autoscrollRenderer() == this)
-        frame().eventHandler().stopAutoscrollTimer(true);
-
-    clearOverrideSize();
-#if ENABLE(CSS_GRID_LAYOUT)
-    clearContainingBlockOverrideSize();
-#endif
-
-    RenderBlock::removePercentHeightDescendantIfNeeded(*this);
-
-#if ENABLE(CSS_SHAPES)
-    ShapeOutsideInfo::removeInfo(*this);
-#endif
-
-    RenderBoxModelObject::willBeDestroyed();
-}
-
 RenderBlockFlow* RenderBox::outermostBlockContainingFloatingObject()
 {
     ASSERT(isFloating());

diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h
@@ -615,8 +615,6 @@ class RenderBox : public RenderBoxModelObject {
     RenderBox(Element&, PassRef<RenderStyle>, unsigned baseTypeFlags);
     RenderBox(Document&, PassRef<RenderStyle>, unsigned baseTypeFlags);
 
-    virtual void willBeDestroyed() override;
-
     virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) override;
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
     virtual void updateFromStyle() override;