cc: Fix resource eviction with impl-side painting.

cc/single_thread_proxy.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/single_thread_proxy.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/draw_quad.h"
 #include "cc/layer_tree_host.h"
+#include "cc/layer_tree_impl.h"
 #include "cc/output_surface.h"
 #include "cc/prioritized_resource_manager.h"
 #include "cc/resource_update_controller.h"
 #include "cc/thread.h"
 
 namespace cc {
 
 scoped_ptr<Proxy> SingleThreadProxy::create(LayerTreeHost* layerTreeHost)
 {
     return make_scoped_ptr(new SingleThreadProxy(layerTreeHost)).PassAs<Proxy>();
@@ skipping 230 matching lines @@
 }
 
 void SingleThreadProxy::stop()
 {
     TRACE_EVENT0("cc", "SingleThreadProxy::stop");
     DCHECK(Proxy::isMainThread());
     {
         DebugScopedSetMainThreadBlocked mainThreadBlocked(this);
         DebugScopedSetImplThread impl(this);
 
-        if (!m_layerTreeHostImpl->contentsTexturesPurged())
+        if (!m_layerTreeHostImpl->activeTree()->ContentsTexturesPurged())
             m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->resourceProvider());
         m_layerTreeHostImpl.reset();
     }
     m_layerTreeHost = 0;
 }
 
 void SingleThreadProxy::setNeedsRedrawOnImplThread()
 {
     m_layerTreeHost->scheduleComposite();
 }
@@ skipping 66 matching lines @@
     DCHECK(Proxy::isMainThread());
 
     if (!m_layerTreeHost->initializeRendererIfNeeded())
         return false;
 
     m_layerTreeHost->contentsTextureManager()->unlinkAndClearEvictedBackings();
 
     scoped_ptr<ResourceUpdateQueue> queue = make_scoped_ptr(new ResourceUpdateQueue);
     m_layerTreeHost->updateLayers(*(queue.get()), m_layerTreeHostImpl->memoryAllocationLimitBytes());
 
-    if (m_layerTreeHostImpl->contentsTexturesPurged())
-        m_layerTreeHostImpl->resetContentsTexturesPurged();
-
     m_layerTreeHost->willCommit();
     doCommit(queue.Pass());
     bool result = doComposite();
     m_layerTreeHost->didBeginFrame();
     return result;
 }
 
 bool SingleThreadProxy::doComposite()
 {
     DCHECK(!m_outputSurfaceLost);
@@ skipping 40 matching lines @@
 }
 
 skia::RefPtr<SkPicture> SingleThreadProxy::capturePicture()
 {
     // Requires impl-side painting, which is only supported in threaded compositing.
     NOTREACHED();
     return skia::RefPtr<SkPicture>();
 }
 
 }  // namespace cc