Merge 94964 - [chromium] REGRESSION(94353): Compositor textures and resources leaked when tab clo...

Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp

Index: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp	(revision 94966)
+++ Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp	(working copy)
@@ -202,12 +202,32 @@
 #endif
 }
 
+void CCLayerTreeHost::clearRenderSurfacesRecursive(LayerChromium* layer)
+{
+    for (size_t i = 0; i < layer->children().size(); ++i)
+        clearRenderSurfacesRecursive(layer->children()[i].get());
+
+    if (layer->replicaLayer())
+        clearRenderSurfacesRecursive(layer->replicaLayer());
+
+    if (layer->maskLayer())
+        clearRenderSurfacesRecursive(layer->maskLayer());
+
+    layer->clearRenderSurface();
+}
+
+
 void CCLayerTreeHost::setRootLayer(GraphicsLayer* layer)
 {
     m_nonCompositedContentHost->graphicsLayer()->removeAllChildren();
     m_nonCompositedContentHost->invalidateEntireLayer();
     if (layer)
         m_nonCompositedContentHost->graphicsLayer()->addChild(layer);
+    else {
+        clearRenderSurfacesRecursive(rootLayer()->platformLayer());
+        m_nonCompositedContentHost->graphicsLayer()->platformLayer()->setLayerTreeHost(0);
+        m_rootLayer->platformLayer()->setLayerTreeHost(0);
+    }
 }
 
 void CCLayerTreeHost::setViewport(const IntSize& viewportSize, const IntSize& contentsSize, const IntPoint& scrollPosition)