Title: [175943] releases/WebKitGTK/webkit-2.6/Source/WebCore
- Revision
- 175943
- Author
- [email protected]
- Date
- 2014-11-11 09:25:14 -0800 (Tue, 11 Nov 2014)
Log 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:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (175942 => 175943)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 17:22:40 UTC (rev 175942)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 17:25:14 UTC (rev 175943)
@@ -1,3 +1,23 @@
+2014-11-03 Andreas Kling <[email protected]>
+
+ 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 <[email protected]>
REGRESSION: Using a media element changes window.name
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderCounter.cpp (175942 => 175943)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderCounter.cpp 2014-11-11 17:22:40 UTC (rev 175942)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderCounter.cpp 2014-11-11 17:25:14 UTC (rev 175943)
@@ -350,18 +350,14 @@
RenderCounter::~RenderCounter()
{
+ view().removeRenderCounter();
+
if (m_counterNode) {
m_counterNode->removeRenderer(this);
ASSERT(!m_counterNode);
}
}
-void RenderCounter::willBeDestroyed()
-{
- view().removeRenderCounter();
- RenderText::willBeDestroyed();
-}
-
const char* RenderCounter::renderName() const
{
return "RenderCounter";
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderCounter.h (175942 => 175943)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderCounter.h 2014-11-11 17:22:40 UTC (rev 175942)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderCounter.h 2014-11-11 17:25:14 UTC (rev 175943)
@@ -42,9 +42,6 @@
void updateCounter();
-protected:
- virtual void willBeDestroyed();
-
private:
virtual const char* renderName() const;
virtual bool isCounter() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
