Title: [134487] trunk/Source/WebKit2
- Revision
- 134487
- Author
- [email protected]
- Date
- 2012-11-13 14:34:24 -0800 (Tue, 13 Nov 2012)
Log Message
RemoteGraphicsLayer destructor should call GraphicsLayer::willBeDestroyed
https://bugs.webkit.org/show_bug.cgi?id=102135
Reviewed by Andreas Kling.
Call GraphicsLayer::willBeDestroyed from the RemoteGraphicsLayer destructor and move
the call to RemoteLayerTreeContext::layerWillBeDestroyed to the overridden
willBeDestroyed member function.
* WebProcess/WebPage/mac/RemoteGraphicsLayer.h:
(RemoteGraphicsLayer):
* WebProcess/WebPage/mac/RemoteGraphicsLayer.mm:
(WebKit::RemoteGraphicsLayer::~RemoteGraphicsLayer):
(WebKit::RemoteGraphicsLayer::willBeDestroyed):
(WebKit):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (134486 => 134487)
--- trunk/Source/WebKit2/ChangeLog 2012-11-13 22:32:00 UTC (rev 134486)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-13 22:34:24 UTC (rev 134487)
@@ -1,3 +1,21 @@
+2012-11-13 Anders Carlsson <[email protected]>
+
+ RemoteGraphicsLayer destructor should call GraphicsLayer::willBeDestroyed
+ https://bugs.webkit.org/show_bug.cgi?id=102135
+
+ Reviewed by Andreas Kling.
+
+ Call GraphicsLayer::willBeDestroyed from the RemoteGraphicsLayer destructor and move
+ the call to RemoteLayerTreeContext::layerWillBeDestroyed to the overridden
+ willBeDestroyed member function.
+
+ * WebProcess/WebPage/mac/RemoteGraphicsLayer.h:
+ (RemoteGraphicsLayer):
+ * WebProcess/WebPage/mac/RemoteGraphicsLayer.mm:
+ (WebKit::RemoteGraphicsLayer::~RemoteGraphicsLayer):
+ (WebKit::RemoteGraphicsLayer::willBeDestroyed):
+ (WebKit):
+
2012-11-13 Brady Eidson <[email protected]>
Split NetworkRequest up into a request class and a loading class.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.h (134486 => 134487)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.h 2012-11-13 22:32:00 UTC (rev 134486)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.h 2012-11-13 22:34:24 UTC (rev 134487)
@@ -62,6 +62,8 @@
virtual void flushCompositingState(const WebCore::FloatRect&) OVERRIDE;
virtual void flushCompositingStateForThisLayerOnly() OVERRIDE;
+ virtual void willBeDestroyed() OVERRIDE;
+
void noteLayerPropertiesChanged(unsigned layerChanges);
void noteSublayersChanged();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.mm (134486 => 134487)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.mm 2012-11-13 22:32:00 UTC (rev 134486)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.mm 2012-11-13 22:34:24 UTC (rev 134487)
@@ -56,7 +56,7 @@
RemoteGraphicsLayer::~RemoteGraphicsLayer()
{
- m_context->layerWillBeDestroyed(this);
+ willBeDestroyed();
}
void RemoteGraphicsLayer::setName(const String& name)
@@ -163,6 +163,12 @@
m_uncommittedLayerChanges = RemoteLayerTreeTransaction::NoChange;
}
+void RemoteGraphicsLayer::willBeDestroyed()
+{
+ m_context->layerWillBeDestroyed(this);
+ GraphicsLayer::willBeDestroyed();
+}
+
void RemoteGraphicsLayer::noteLayerPropertiesChanged(unsigned layerChanges)
{
if (!m_uncommittedLayerChanges && m_client)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
