Changeset 175948 in webkit

Timestamp:

Nov 11, 2014, 9:39:08 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

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:

Location:

releases/WebKitGTK/webkit-2.6/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (2 diffs)
• rendering/RenderBox.h (modified) (1 diff)

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

@@ +1 @@
+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>
 

releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBox.cpp

@@ -130 +130 @@
 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))
@@ -233 +247 @@
         return LayoutRect(logicalLeft, 0, logicalWidth, height());
     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();
 }
 

releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBox.h

@@ -616 +616 @@
     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;