[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
vangelis at chromium.org
vangelis at chromium.org
Wed Dec 22 13:09:26 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit dc84600be08c21329bd8cb6083ec528563bc63ce
Author: vangelis at chromium.org <vangelis at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 7 23:05:44 2010 +0000
2010-09-07 Vangelis Kokkevis <vangelis at chromium.org>
Reviewed by Darin Fisher.
[chromium] Reset the owner of PlatformLayer's once the GraphicsLayer they are associated with
gets destroyed.
https://bugs.webkit.org/show_bug.cgi?id=45329
Test: Fixes UI test failures downstream for all the Media tests when run on the buildbots (machines without GPUs).
* platform/graphics/chromium/GraphicsLayerChromium.cpp:
(WebCore::GraphicsLayerChromium::~GraphicsLayerChromium):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66923 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4d2b1c5..ed6e620 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-07 Vangelis Kokkevis <vangelis at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ [chromium] Reset the owner of PlatformLayer's once the GraphicsLayer they are associated with
+ gets destroyed.
+ https://bugs.webkit.org/show_bug.cgi?id=45329
+
+ Test: Fixes UI test failures downstream for all the Media tests when run on the buildbots (machines without GPUs).
+
+ * platform/graphics/chromium/GraphicsLayerChromium.cpp:
+ (WebCore::GraphicsLayerChromium::~GraphicsLayerChromium):
+
2010-09-07 Anders Carlsson <andersca at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp b/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
index 92cc891..bbae72a 100644
--- a/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
@@ -106,6 +106,12 @@ GraphicsLayerChromium::GraphicsLayerChromium(GraphicsLayerClient* client)
GraphicsLayerChromium::~GraphicsLayerChromium()
{
+ if (m_layer)
+ m_layer->setOwner(0);
+ if (m_contentsLayer)
+ m_contentsLayer->setOwner(0);
+ if (m_transformLayer)
+ m_transformLayer->setOwner(0);
}
void GraphicsLayerChromium::setName(const String& inName)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list