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

cc/prioritized_texture_manager.cc

 // Copyright 2012 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/prioritized_texture_manager.h"
 
 #include "base/debug/trace_event.h"
 #include "base/stl_util.h"
@@ skipping 19 matching lines @@
     , m_memoryVisibleLastPushedBytes(0)
     , m_memoryVisibleAndNearbyLastPushedBytes(0)
 {
 }
 
 PrioritizedTextureManager::~PrioritizedTextureManager()
 {
     while (m_textures.size() > 0)
         unregisterTexture(*m_textures.begin());
 
-    deleteUnlinkedEvictedBackings();
+    unlinkAndClearEvictedBackings();
     DCHECK(m_evictedBackings.empty());
 
     // Each remaining backing is a leaked opengl texture. There should be none.
     DCHECK(m_backings.empty());
 }
 
 size_t PrioritizedTextureManager::memoryVisibleBytes() const
 {
     DCHECK(Proxy::isImplThread());
     return m_memoryVisibleLastPushedBytes;
@@ skipping 250 matching lines @@
             break;
         wastedMemory += (*it)->bytes();
     }
     size_t tenPercentOfMemory = m_memoryAvailableBytes / 10;
     if (wastedMemory > tenPercentOfMemory)
         evictBackingsToReduceMemory(memoryUseBytes() - (wastedMemory - tenPercentOfMemory),
                                     PriorityCalculator::allowEverythingCutoff(),
                                     EvictOnlyRecyclable,
                                     UnlinkBackings,
                                     resourceProvider);
-
-    // Unlink all evicted backings
-    for (BackingList::const_iterator it = m_evictedBackings.begin(); it != m_evictedBackings.end(); ++it) {
-        if ((*it)->owner())
-            (*it)->owner()->unlink();
-    }
-
-    // And clear the list of evicted backings
-    deleteUnlinkedEvictedBackings();
 }
 
 void PrioritizedTextureManager::clearAllMemory(ResourceProvider* resourceProvider)
 {
     DCHECK(Proxy::isImplThread() && Proxy::isMainThreadBlocked());
     DCHECK(resourceProvider);
     evictBackingsToReduceMemory(0,
                                 PriorityCalculator::allowEverythingCutoff(),
                                 EvictAnything,
                                 DoNotUnlinkBackings,
                                 resourceProvider);
 }
 
 bool PrioritizedTextureManager::reduceMemoryOnImplThread(size_t limitBytes, int priorityCutoff, ResourceProvider* resourceProvider)
 {
     DCHECK(Proxy::isImplThread());
     DCHECK(resourceProvider);
     // If we are in the process of uploading a new frame then the backings at the very end of
     // the list are not sorted by priority. Sort them before doing the eviction.
     if (m_backingsTailNotSorted)
         sortBackings();
     return evictBackingsToReduceMemory(limitBytes,
                                        priorityCutoff,
                                        EvictAnything,
                                        DoNotUnlinkBackings,
                                        resourceProvider);
 }
 
-void PrioritizedTextureManager::getEvictedBackings(BackingList& evictedBackings)
-{
-    DCHECK(Proxy::isImplThread());
-    evictedBackings.clear();
-    evictedBackings.insert(evictedBackings.begin(), m_evictedBackings.begin(), m_evictedBackings.end());
-}
-
-void PrioritizedTextureManager::unlinkEvictedBackings(const BackingList& evictedBackings)
+void PrioritizedTextureManager::unlinkAndClearEvictedBackings()
 {
     DCHECK(Proxy::isMainThread());
-    for (BackingList::const_iterator it = evictedBackings.begin(); it != evictedBackings.end(); ++it) {
+    base::AutoLock scoped_lock(m_evictedBackingsLock);
+    for (BackingList::const_iterator it = m_evictedBackings.begin(); it != m_evictedBackings.end(); ++it) {
         PrioritizedTexture::Backing* backing = (*it);
         if (backing->owner())
             backing->owner()->unlink();
+        delete backing;
     }
-}
-
-void PrioritizedTextureManager::deleteUnlinkedEvictedBackings()
-{
-    DCHECK(Proxy::isMainThread() || (Proxy::isImplThread() && Proxy::isMainThreadBlocked()));
-    BackingList newEvictedBackings;
-    for (BackingList::const_iterator it = m_evictedBackings.begin(); it != m_evictedBackings.end(); ++it) {
-        PrioritizedTexture::Backing* backing = (*it);
-        if (backing->owner())
-            newEvictedBackings.push_back(backing);
-        else
-            delete backing;
-    }
-    m_evictedBackings.swap(newEvictedBackings);
+    m_evictedBackings.clear();
 }
 
 bool PrioritizedTextureManager::linkedEvictedBackingsExist() const
 {
+    DCHECK(Proxy::isImplThread() && Proxy::isMainThreadBlocked());
+    base::AutoLock scoped_lock(m_evictedBackingsLock);
     for (BackingList::const_iterator it = m_evictedBackings.begin(); it != m_evictedBackings.end(); ++it) {
         if ((*it)->owner())
             return true;
     }
     return false;
 }
 
 void PrioritizedTextureManager::registerTexture(PrioritizedTexture* texture)
 {
     DCHECK(Proxy::isMainThread());
@@ skipping 43 matching lines @@
     DCHECK(!m_backings.empty());
     PrioritizedTexture::Backing* backing = m_backings.front();
 
     // Note that we create a backing and its resource at the same time, but we
     // delete the backing structure and its resource in two steps. This is because
     // we can delete the resource while the main thread is running, but we cannot
     // unlink backings while the main thread is running.
     backing->deleteResource(resourceProvider);
     m_memoryUseBytes -= backing->bytes();
     m_backings.pop_front();
+    base::AutoLock scoped_lock(m_evictedBackingsLock);
     m_evictedBackings.push_back(backing);
 }
 
 void PrioritizedTextureManager::assertInvariants()
 {
 #ifndef NDEBUG
     DCHECK(Proxy::isImplThread() && Proxy::isMainThreadBlocked());
 
     // If we hit any of these asserts, there is a bug in this class. To see
     // where the bug is, call this function at the beginning and end of
     // every public function.
 
     // Backings/textures must be doubly-linked and only to other backings/textures in this manager.
     for (BackingList::iterator it = m_backings.begin(); it != m_backings.end(); ++it) {
         if ((*it)->owner()) {
             DCHECK(ContainsKey(m_textures, (*it)->owner()));
             DCHECK((*it)->owner()->backing() == (*it));
         }
     }
     for (TextureSet::iterator it = m_textures.begin(); it != m_textures.end(); ++it) {
         PrioritizedTexture* texture = (*it);
         PrioritizedTexture::Backing* backing = texture->backing();
+        base::AutoLock scoped_lock(m_evictedBackingsLock);
         if (backing) {
             if (backing->resourceHasBeenDeleted()) {
                 DCHECK(std::find(m_backings.begin(), m_backings.end(), backing) == m_backings.end());
                 DCHECK(std::find(m_evictedBackings.begin(), m_evictedBackings.end(), backing) != m_evictedBackings.end());
             } else {
                 DCHECK(std::find(m_backings.begin(), m_backings.end(), backing) != m_backings.end());
                 DCHECK(std::find(m_evictedBackings.begin(), m_evictedBackings.end(), backing) == m_evictedBackings.end());
             }
             DCHECK(backing->owner() == texture);
         }
@@ skipping 13 matching lines @@
         if (reachedUnrecyclable)
             DCHECK(!backing->canBeRecycled());
         else
             DCHECK(backing->canBeRecycled());
         previous_backing = backing;
     }
 #endif
 }
 
 } // namespace cc