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

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

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 184 matching lines @@
 void CCLayerTreeHost::setNeedsRedraw()
 {
 #if USE(THREADED_COMPOSITING)
     TRACE_EVENT("CCLayerTreeHost::setNeedsRedraw", this, 0);
     m_proxy->setNeedsRedraw();
 #else
     m_client->scheduleComposite();
 #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)
 {
     bool visibleRectChanged = m_viewportSize != viewportSize;
 
     m_viewportSize = viewportSize;
     m_nonCompositedContentHost->setScrollPosition(scrollPosition);
     m_nonCompositedContentHost->graphicsLayer()->setSize(contentsSize);
 
@@ skipping 174 matching lines @@
     if (layer->maskLayer())
         updateCompositorResources(layer->maskLayer(), context);
     if (layer->replicaLayer())
         updateCompositorResources(layer->replicaLayer(), context);
 
     if (layer->drawsContent())
         layer->updateCompositorResources(context);
 }
 
 }