Changeset 175818 in webkit

Timestamp:

Nov 10, 2014, 12:03:44 PM (11 years ago)

Author:

Simon Fraser

Message:

[iOS WK2] Layers with negative z position disapear behind the page tiles
​https://bugs.webkit.org/show_bug.cgi?id=138571
rdar://problem/18873480

Reviewed by Dean Jackson.

Some crufty iOS-only code in RenderLayerBacking::parentForSublayers() caused us to fail
to use the m_childContainmentLayer as the ancestor for descendants, so layers with
negative z position would get depth-sorted behind the tiles.

Fix by removing that code.

This should have been detected by compositing/tile-cache-must-flatten.html, but
testing infrastructure suck prevented us from doing so.

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::parentForSublayers):

• rendering/RenderLayerBacking.h: Just some nullptr cleanup.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)
• rendering/RenderLayerBacking.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-10  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] Layers with negative z position disapear behind the page tiles
+        https://bugs.webkit.org/show_bug.cgi?id=138571
+        rdar://problem/18873480
+
+        Reviewed by Dean Jackson.
+
+        Some crufty iOS-only code in RenderLayerBacking::parentForSublayers() caused us to fail
+        to use the m_childContainmentLayer as the ancestor for descendants, so layers with
+        negative z position would get depth-sorted behind the tiles.
+        
+        Fix by removing that code.
+        
+        This should have been detected by compositing/tile-cache-must-flatten.html, but
+        testing infrastructure suck prevented us from doing so.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::parentForSublayers):
+        * rendering/RenderLayerBacking.h: Just some nullptr cleanup.
+
 2014-11-10  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1994 +1994 @@
         return m_scrollingContentsLayer.get();
 
-#if PLATFORM(IOS)
-    // FIXME: Can we remove this iOS-specific code path?
-    if (GraphicsLayer* clippingLayer = this->clippingLayer())
-        return clippingLayer;
-    return m_graphicsLayer.get();
-#else
     return m_childContainmentLayer ? m_childContainmentLayer.get() : m_graphicsLayer.get();
-#endif
 }
 

trunk/Source/WebCore/rendering/RenderLayerBacking.h

@@ -90 +90 @@
     // Layer to clip children
     bool hasClippingLayer() const { return (m_childContainmentLayer && !m_usingTiledCacheLayer); }
-    GraphicsLayer* clippingLayer() const { return !m_usingTiledCacheLayer ? m_childContainmentLayer.get() : 0; }
+    GraphicsLayer* clippingLayer() const { return !m_usingTiledCacheLayer ? m_childContainmentLayer.get() : nullptr; }
 
     // Layer to get clipped by ancestor
-    bool hasAncestorClippingLayer() const { return m_ancestorClippingLayer != 0; }
+    bool hasAncestorClippingLayer() const { return m_ancestorClippingLayer != nullptr; }
     GraphicsLayer* ancestorClippingLayer() const { return m_ancestorClippingLayer.get(); }
 
     GraphicsLayer* contentsContainmentLayer() const { return m_contentsContainmentLayer.get(); }
 
-    bool hasContentsLayer() const { return m_foregroundLayer != 0; }
+    bool hasContentsLayer() const { return m_foregroundLayer != nullptr; }
     GraphicsLayer* foregroundLayer() const { return m_foregroundLayer.get(); }