Changeset 175940 in webkit

Timestamp:

Nov 11, 2014, 9:21:41 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r175475 - RenderLayerModelObject shouldn't need a pre-destructor hook.
<​https://webkit.org/b/138314>

Reviewed by Antti Koivisto.

Move code from the willBeDestroyed() pre-destructor hook to the regular
~RenderLayerModelObject() destructor.

We just need to unregister the renderer from the FrameView's set of
viewport-constrained objects. That doesn't require being able to walk
the render tree or call virtuals, which is the main reason you'd use
willBeDestroyed().

• rendering/RenderLayerModelObject.cpp:

(WebCore::RenderLayerModelObject::~RenderLayerModelObject):
(WebCore::RenderLayerModelObject::willBeDestroyed): Deleted.

• rendering/RenderLayerModelObject.h:

Location:

releases/WebKitGTK/webkit-2.6/Source/WebCore

Files:

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

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

@@ +1 @@
+2014-11-03  Andreas Kling  <akling@apple.com>
+
+        RenderLayerModelObject shouldn't need a pre-destructor hook.
+        <https://webkit.org/b/138314>
+
+        Reviewed by Antti Koivisto.
+
+        Move code from the willBeDestroyed() pre-destructor hook to the regular
+        ~RenderLayerModelObject() destructor.
+
+        We just need to unregister the renderer from the FrameView's set of
+        viewport-constrained objects. That doesn't require being able to walk
+        the render tree or call virtuals, which is the main reason you'd use
+        willBeDestroyed().
+
+        * rendering/RenderLayerModelObject.cpp:
+        (WebCore::RenderLayerModelObject::~RenderLayerModelObject):
+        (WebCore::RenderLayerModelObject::willBeDestroyed): Deleted.
+        * rendering/RenderLayerModelObject.h:
+
 2014-11-02  Chris Dumez  <cdumez@apple.com>
 

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

@@ -48 +48 @@
 RenderLayerModelObject::~RenderLayerModelObject()
 {
+    if (isPositioned()) {
+        if (style().hasViewportConstrainedPosition())
+            view().frameView().removeViewportConstrainedObject(this);
+    }
+
     // Our layer should have been destroyed and cleared by now
     ASSERT(!hasLayer());
@@ -71 +76 @@
 {
     return m_layer && m_layer->isSelfPaintingLayer();
-}
-
-void RenderLayerModelObject::willBeDestroyed()
-{
-    if (isPositioned()) {
-        if (style().hasViewportConstrainedPosition())
-            view().frameView().removeViewportConstrainedObject(this);
-    }
-
-    // RenderObject::willBeDestroyed calls back to destroyLayer() for layer destruction
-    RenderElement::willBeDestroyed();
 }
 

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

@@ -58 +58 @@
     void createLayer();
 
-    virtual void willBeDestroyed() override;
-
 private:
     std::unique_ptr<RenderLayer> m_layer;