Title: [178819] branches/safari-600.1.4.15-branch/Source/WebCore
- Revision
- 178819
- Author
- [email protected]
- Date
- 2015-01-21 00:20:03 -0800 (Wed, 21 Jan 2015)
Log Message
Merged r175818. rdar://problem/19419835
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178818 => 178819)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 08:18:52 UTC (rev 178818)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 08:20:03 UTC (rev 178819)
@@ -1,5 +1,30 @@
2015-01-21 Babak Shafiei <[email protected]>
+ Merge r175818.
+
+ 2014-11-10 Simon Fraser <[email protected]>
+
+ [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.
+
+2015-01-21 Babak Shafiei <[email protected]>
+
Merge r175812.
2014-11-10 Eric Carlson <[email protected]>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (178818 => 178819)
--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-01-21 08:18:52 UTC (rev 178818)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-01-21 08:20:03 UTC (rev 178819)
@@ -1973,14 +1973,7 @@
if (m_scrollingContentsLayer)
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
}
GraphicsLayer* RenderLayerBacking::childForSuperlayers() const
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerBacking.h (178818 => 178819)
--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerBacking.h 2015-01-21 08:18:52 UTC (rev 178818)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerBacking.h 2015-01-21 08:20:03 UTC (rev 178819)
@@ -89,15 +89,15 @@
// 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(); }
GraphicsLayer* backgroundLayer() const { return m_backgroundLayer.get(); }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
