Merge 170403 - Use a lock to deal with concurrent access to the m_evictedBackings

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 "config.h"
 
 #include "cc/single_thread_proxy.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/draw_quad.h"
@@ skipping 320 matching lines @@
 }
 
 bool SingleThreadProxy::commitAndComposite()
 {
     DCHECK(Proxy::isMainThread());
 
     if (!m_layerTreeHost->initializeRendererIfNeeded())
         return false;
 
     // Unlink any texture backings that were deleted
-    PrioritizedTextureManager::BackingList evictedContentsTexturesBackings;
-    {
-        DebugScopedSetImplThread implThread;
-        m_layerTreeHost->contentsTextureManager()->getEvictedBackings(evictedContentsTexturesBackings);
-    }
-    m_layerTreeHost->contentsTextureManager()->unlinkEvictedBackings(evictedContentsTexturesBackings);
+    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();
@@ skipping 35 matching lines @@
 
 void SingleThreadProxy::didSwapFrame()
 {
     if (m_nextFrameIsNewlyCommittedFrame) {
         m_nextFrameIsNewlyCommittedFrame = false;
         m_layerTreeHost->didCommitAndDrawFrame();
     }
 }
 
 }