Do not merge.

Remove the notion of root layers.

We were computing the root layer status incorrectly for some child layers. If an
iframe has a layer but it hasn't been attached, we might assume it is the root
layer of the tree and not produce a recording content.

Bug: 3492471
Change-Id: Ib81fb26d76742d74ebe244c34c1fab353fb9b78d

1 files changed, 2 insertions, 8 deletions

diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index 7963ae0..4cd48a8 100644
--- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -124,11 +124,7 @@ GraphicsLayerAndroid::GraphicsLayerAndroid(GraphicsLayerClient* client) :
     m_foregroundClipLayer(0)
 {
     RenderLayer* renderLayer = renderLayerFromClient(m_client);
-    m_contentLayer = new LayerAndroid(renderLayer, true);
-    if (renderLayer) {
-        m_contentLayer->setIsRootLayer(renderLayer->isRootLayer()
-            && !(renderLayer->renderer()->frame()->ownerElement()));
-    }
+    m_contentLayer = new LayerAndroid(renderLayer);
     gDebugGraphicsLayerAndroidInstances++;
 }
 
@@ -390,8 +386,6 @@ void GraphicsLayerAndroid::setDrawsContent(bool drawsContent)
     if (drawsContent == m_drawsContent)
         return;
     GraphicsLayer::setDrawsContent(drawsContent);
-    if (m_contentLayer->isRootLayer())
-        return;
     if (m_drawsContent) {
         m_haveContents = true;
         setNeedsDisplay();
@@ -503,7 +497,7 @@ void GraphicsLayerAndroid::updateScrollingLayers()
         if (layerNeedsOverflow) {
             ASSERT(!m_foregroundLayer && !m_foregroundClipLayer);
             m_foregroundLayer = new ScrollableLayerAndroid(layer);
-            m_foregroundClipLayer = new LayerAndroid(layer, false);
+            m_foregroundClipLayer = new LayerAndroid(layer);
             m_foregroundClipLayer->setMasksToBounds(true);
             m_foregroundClipLayer->addChild(m_foregroundLayer);
             m_contentLayer->addChild(m_foregroundClipLayer);