Title: [113135] trunk/Source
- Revision
- 113135
- Author
- yael.aha...@nokia.com
- Date
- 2012-04-03 21:21:15 -0700 (Tue, 03 Apr 2012)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (113134 => 113135)
--- trunk/Source/WebCore/ChangeLog 2012-04-04 03:52:07 UTC (rev 113134)
+++ trunk/Source/WebCore/ChangeLog 2012-04-04 04:21:15 UTC (rev 113135)
@@ -1,3 +1,19 @@
+2012-04-03 Yael Aharon <yael.aha...@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 <ba...@chromium.org>
[Chromium] Out-of-process font loading garbles text
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (113134 => 113135)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2012-04-04 03:52:07 UTC (rev 113134)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2012-04-04 04:21:15 UTC (rev 113135)
@@ -57,8 +57,14 @@
GraphicsLayerTextureMapper::~GraphicsLayerTextureMapper()
{
+ willBeDestroyed();
}
+void GraphicsLayerTextureMapper::willBeDestroyed()
+{
+ GraphicsLayer::willBeDestroyed();
+}
+
/* \reimp (GraphicsLayer.h): The current size might change, thus we need to update the whole display.
*/
void GraphicsLayerTextureMapper::setNeedsDisplay()
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (113134 => 113135)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2012-04-04 03:52:07 UTC (rev 113134)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2012-04-04 04:21:15 UTC (rev 113135)
@@ -95,6 +95,8 @@
#endif
private:
+ virtual void willBeDestroyed();
+
OwnPtr<TextureMapperLayer> m_layer;
RefPtr<TextureMapperBackingStore> m_compositedImage;
RefPtr<Image> m_image;
Modified: trunk/Source/WebKit2/ChangeLog (113134 => 113135)
--- trunk/Source/WebKit2/ChangeLog 2012-04-04 03:52:07 UTC (rev 113134)
+++ trunk/Source/WebKit2/ChangeLog 2012-04-04 04:21:15 UTC (rev 113135)
@@ -1,3 +1,19 @@
+2012-04-03 Yael Aharon <yael.aha...@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 <s...@webkit.org>
Allow the old WebKit2 drawing model to host layers in the window server
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (113134 => 113135)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2012-04-04 03:52:07 UTC (rev 113134)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2012-04-04 04:21:15 UTC (rev 113135)
@@ -103,8 +103,14 @@
purgeBackingStores();
m_webGraphicsLayerClient->detachLayer(this);
}
+ willBeDestroyed();
}
+void WebGraphicsLayer::willBeDestroyed()
+{
+ GraphicsLayer::willBeDestroyed();
+}
+
bool WebGraphicsLayer::setChildren(const Vector<GraphicsLayer*>& children)
{
bool ok = GraphicsLayer::setChildren(children);
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h (113134 => 113135)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h 2012-04-04 03:52:07 UTC (rev 113134)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h 2012-04-04 04:21:15 UTC (rev 113135)
@@ -142,6 +142,7 @@
#endif
private:
+ virtual void willBeDestroyed();
WebKit::WebLayerInfo m_layerInfo;
RefPtr<Image> m_image;
GraphicsLayer* m_maskTarget;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
