Title: [166339] trunk/Source/WebCore
Revision
166339
Author
[email protected]
Date
2014-03-26 20:53:31 -0700 (Wed, 26 Mar 2014)

Log Message

Make sure childContainmentLayer is parented
https://bugs.webkit.org/show_bug.cgi?id=130808

Reviewed by Tim Horton.

m_childContainmentLayer was never parented if the page
created no other compositing layers, which left a dangling
GraphicsLayer which in turn confused UI-side compositing a little.
Fix by always parenting this layer.

* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (166338 => 166339)


--- trunk/Source/WebCore/ChangeLog	2014-03-27 03:46:04 UTC (rev 166338)
+++ trunk/Source/WebCore/ChangeLog	2014-03-27 03:53:31 UTC (rev 166339)
@@ -1,3 +1,18 @@
+2014-03-26  Simon Fraser  <[email protected]>
+
+        Make sure childContainmentLayer is parented
+        https://bugs.webkit.org/show_bug.cgi?id=130808
+
+        Reviewed by Tim Horton.
+
+        m_childContainmentLayer was never parented if the page
+        created no other compositing layers, which left a dangling
+        GraphicsLayer which in turn confused UI-side compositing a little.
+        Fix by always parenting this layer.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
+
 2014-03-26  Brian Burg  <[email protected]>
 
         Web Replay: disable page cache during capture/replay

Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (166338 => 166339)


--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp	2014-03-27 03:46:04 UTC (rev 166338)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp	2014-03-27 03:53:31 UTC (rev 166339)
@@ -299,8 +299,10 @@
     m_graphicsLayer = createGraphicsLayer(layerName);
     m_creatingPrimaryGraphicsLayer = false;
 
-    if (m_usingTiledCacheLayer)
+    if (m_usingTiledCacheLayer) {
         m_childContainmentLayer = createGraphicsLayer("TiledBacking Flattening Layer");
+        m_graphicsLayer->addChild(m_childContainmentLayer.get());
+    }
 
     if (m_isMainFrameRenderViewLayer) {
 #if !PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to