Changeset 175946 in webkit

Timestamp:

Nov 11, 2014, 9:33:43 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r175528 - RenderQuote shouldn't need a pre-destructor hook.
<​https://webkit.org/b/138352>

Reviewed by Antti Koivisto.

The willBeDestroyed() hook in RenderQuote came from the time when it was
potential unsafe to access the RenderView from a renderer destructor.

Move the code to the plain ol' destructor instead.

• rendering/RenderQuote.cpp:

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

• rendering/RenderQuote.h:

Location:

releases/WebKitGTK/webkit-2.6/Source/WebCore

Files:

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

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

@@ +1 @@
+2014-11-04  Andreas Kling  <akling@apple.com>
+
+        RenderQuote shouldn't need a pre-destructor hook.
+        <https://webkit.org/b/138352>
+
+        Reviewed by Antti Koivisto.
+
+        The willBeDestroyed() hook in RenderQuote came from the time when it was
+        potential unsafe to access the RenderView from a renderer destructor.
+
+        Move the code to the plain ol' destructor instead.
+
+        * rendering/RenderQuote.cpp:
+        (WebCore::RenderQuote::~RenderQuote):
+        (WebCore::RenderQuote::willBeDestroyed): Deleted.
+        * rendering/RenderQuote.h:
+
 2014-11-03  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -44 +44 @@
 RenderQuote::~RenderQuote()
 {
+    detachQuote();
+
     ASSERT(!m_isAttached);
     ASSERT(!m_next);
     ASSERT(!m_previous);
-}
-
-void RenderQuote::willBeDestroyed()
-{
-    detachQuote();
-    RenderInline::willBeDestroyed();
 }
 

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

@@ -38 +38 @@
     void detachQuote();
 
-    virtual void willBeDestroyed() override;
     virtual const char* renderName() const override { return "RenderQuote"; }
     virtual bool isQuote() const override { return true; };