Changeset 175943 in webkit

Timestamp:

Nov 11, 2014, 9:25:14 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r175485 - RenderCounter shouldn't need a pre-destructor hook.
<​https://webkit.org/b/138316>

Reviewed by Antti Koivisto.

RenderCounter will automatically register/unregister itself with
the RenderView when constructed/destroyed.

It was using a willBeDestroyed() hook because it used to be that you
couldn't get to the RenderView in the destructor. That's no longer
an issue as Document promises that RenderView is the last render tree
node to go away.

• rendering/RenderCounter.cpp:

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

• rendering/RenderCounter.h:

Location:

releases/WebKitGTK/webkit-2.6/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderCounter.cpp (modified) (1 diff)
• rendering/RenderCounter.h (modified) (1 diff)

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

@@ +1 @@
+2014-11-03  Andreas Kling  <akling@apple.com>
+
+        RenderCounter shouldn't need a pre-destructor hook.
+        <https://webkit.org/b/138316>
+
+        Reviewed by Antti Koivisto.
+
+        RenderCounter will automatically register/unregister itself with
+        the RenderView when constructed/destroyed.
+
+        It was using a willBeDestroyed() hook because it used to be that you
+        couldn't get to the RenderView in the destructor. That's no longer
+        an issue as Document promises that RenderView is the last render tree
+        node to go away.
+
+        * rendering/RenderCounter.cpp:
+        (WebCore::RenderCounter::~RenderCounter):
+        (WebCore::RenderCounter::willBeDestroyed): Deleted.
+        * rendering/RenderCounter.h:
+
 2014-11-03  Alexey Proskuryakov  <ap@apple.com>
 

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

@@ -351 +351 @@
 RenderCounter::~RenderCounter()
 {
+    view().removeRenderCounter();
+
     if (m_counterNode) {
         m_counterNode->removeRenderer(this);
         ASSERT(!m_counterNode);
     }
-}
-
-void RenderCounter::willBeDestroyed()
-{
-    view().removeRenderCounter();
-    RenderText::willBeDestroyed();
 }
 

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

@@ -43 +43 @@
     void updateCounter();
 
-protected:
-    virtual void willBeDestroyed();
-
 private:
     virtual const char* renderName() const;