Title: [175946] releases/WebKitGTK/webkit-2.6/Source/WebCore
- Revision
- 175946
- Author
- [email protected]
- Date
- 2014-11-11 09:33:43 -0800 (Tue, 11 Nov 2014)
Log 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:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (175945 => 175946)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 17:32:40 UTC (rev 175945)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 17:33:43 UTC (rev 175946)
@@ -1,3 +1,20 @@
+2014-11-04 Andreas Kling <[email protected]>
+
+ 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 <[email protected]>
[LEAK] [GStreamer] Removing video element will not free assigned memory
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderQuote.cpp (175945 => 175946)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderQuote.cpp 2014-11-11 17:32:40 UTC (rev 175945)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderQuote.cpp 2014-11-11 17:33:43 UTC (rev 175946)
@@ -43,17 +43,13 @@
RenderQuote::~RenderQuote()
{
+ detachQuote();
+
ASSERT(!m_isAttached);
ASSERT(!m_next);
ASSERT(!m_previous);
}
-void RenderQuote::willBeDestroyed()
-{
- detachQuote();
- RenderInline::willBeDestroyed();
-}
-
void RenderQuote::willBeRemovedFromTree()
{
RenderInline::willBeRemovedFromTree();
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderQuote.h (175945 => 175946)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderQuote.h 2014-11-11 17:32:40 UTC (rev 175945)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderQuote.h 2014-11-11 17:33:43 UTC (rev 175946)
@@ -37,7 +37,6 @@
private:
void detachQuote();
- virtual void willBeDestroyed() override;
virtual const char* renderName() const override { return "RenderQuote"; }
virtual bool isQuote() const override { return true; };
virtual void styleDidChange(StyleDifference, const RenderStyle*) override;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
