From 6255aca022b9987c4aab0770dfeadd1c377e7842 Mon Sep 17 00:00:00 2001
From: "yael.aharon@nokia.com"
 <yael.aharon@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 4 Apr 2012 04:21:15 +0000
Subject: [PATCH] [Qt][WK2] Assert on startup after r113090
 https://bugs.webkit.org/show_bug.cgi?id=83111

Reviewed by Noam Rosenthal.

Source/WebCore:

Add willBeDestroyed to to GraphicsLayerTextureMapper.

* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::~GraphicsLayerTextureMapper):
(WebCore):
(WebCore::WebGraphicsLayer::willBeDestroyed):
* platform/graphics/texmap/GraphicsLayerTextureMapper.h:
(GraphicsLayerTextureMapper):

Source/WebKit2:

Add willBeDestroyed to to WebGraphicsLayer.

* WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
(WebCore::WebGraphicsLayer::~WebGraphicsLayer):
(WebCore):
(WebCore::WebGraphicsLayer::willBeDestroyed):
* WebProcess/WebCoreSupport/WebGraphicsLayer.h:
(WebGraphicsLayer):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113135 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 Source/WebCore/ChangeLog                                 | 16 ++++++++++++++++
 .../graphics/texmap/GraphicsLayerTextureMapper.cpp       |  6 ++++++
 .../graphics/texmap/GraphicsLayerTextureMapper.h         |  2 ++
 Source/WebKit2/ChangeLog                                 | 16 ++++++++++++++++
 .../WebProcess/WebCoreSupport/WebGraphicsLayer.cpp       |  6 ++++++
 .../WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h |  1 +
 6 files changed, 47 insertions(+)

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 1fa1b7c..e4d9aff 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2012-04-03  Yael Aharon  <yael.aharon@nokia.com>
+
+        [Qt][WK2] Assert on startup after r113090
+        https://bugs.webkit.org/show_bug.cgi?id=83111
+
+        Reviewed by Noam Rosenthal.
+
+        Add willBeDestroyed to to GraphicsLayerTextureMapper.
+
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+        (WebCore::GraphicsLayerTextureMapper::~GraphicsLayerTextureMapper):
+        (WebCore):
+        (WebCore::WebGraphicsLayer::willBeDestroyed):
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
+        (GraphicsLayerTextureMapper):
+
 2012-04-03  Kenichi Ishibashi  <bashi@chromium.org>
 
         [Chromium] Out-of-process font loading garbles text
diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
index 46169c6..8998973 100644
--- a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
+++ b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
@@ -57,6 +57,12 @@ void GraphicsLayerTextureMapper::setName(const String& name)
 
 GraphicsLayerTextureMapper::~GraphicsLayerTextureMapper()
 {
+    willBeDestroyed();
+}
+
+void GraphicsLayerTextureMapper::willBeDestroyed()
+{
+    GraphicsLayer::willBeDestroyed();
 }
 
 /* \reimp (GraphicsLayer.h): The current size might change, thus we need to update the whole display.
diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h
index 07f3786..bdcd930 100644
--- a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h
+++ b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h
@@ -95,6 +95,8 @@ public:
 #endif
 
 private:
+    virtual void willBeDestroyed();
+
     OwnPtr<TextureMapperLayer> m_layer;
     RefPtr<TextureMapperBackingStore> m_compositedImage;
     RefPtr<Image> m_image;
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 9f35b51..428ee33 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2012-04-03  Yael Aharon  <yael.aharon@nokia.com>
+
+        [Qt][WK2] Assert on startup after r113090
+        https://bugs.webkit.org/show_bug.cgi?id=83111
+
+        Reviewed by Noam Rosenthal.
+
+        Add willBeDestroyed to to WebGraphicsLayer.
+
+        * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+        (WebCore::WebGraphicsLayer::~WebGraphicsLayer):
+        (WebCore):
+        (WebCore::WebGraphicsLayer::willBeDestroyed):
+        * WebProcess/WebCoreSupport/WebGraphicsLayer.h:
+        (WebGraphicsLayer):
+
 2012-04-03  Sam Weinig  <sam@webkit.org>
 
         Allow the old WebKit2 drawing model to host layers in the window server
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp
index d6ce9cc..83e9301 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp
@@ -103,6 +103,12 @@ WebGraphicsLayer::~WebGraphicsLayer()
         purgeBackingStores();
         m_webGraphicsLayerClient->detachLayer(this);
     }
+    willBeDestroyed();
+}
+
+void WebGraphicsLayer::willBeDestroyed()
+{
+    GraphicsLayer::willBeDestroyed();
 }
 
 bool WebGraphicsLayer::setChildren(const Vector<GraphicsLayer*>& children)
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h b/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h
index 0ca5aa5..543c465 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h
@@ -142,6 +142,7 @@ public:
 #endif
 
 private:
+    virtual void willBeDestroyed();
     WebKit::WebLayerInfo m_layerInfo;
     RefPtr<Image> m_image;
     GraphicsLayer* m_maskTarget;
-- 
2.7.4