Enable removing uploads to evicted textures from texture upload queues.

cc/CCPrioritizedTextureManager.cpp

 // 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 "CCPrioritizedTextureManager.h"
 
 #include "CCPrioritizedTexture.h"
 #include "CCPriorityCalculator.h"
@@ skipping 247 matching lines @@
     evictBackingsToReduceMemory(0, DoNotRespectManagerPriorityCutoff, resourceProvider);
     deleteEvictedBackings();
 }
 
 void CCPrioritizedTextureManager::reduceMemoryOnImplThread(size_t limitBytes, CCResourceProvider* resourceProvider)
 {
     ASSERT(CCProxy::isImplThread());
     ASSERT(resourceProvider);
 
     evictBackingsToReduceMemory(limitBytes, DoNotRespectManagerPriorityCutoff, resourceProvider);
-
-    // Deleting just some (not all) resources is not supported yet because we do not clear
-    // only the deleted resources from the texture upload queues (rather, we clear all uploads).
-    // Make sure that if we evict all resources.
-    ASSERT(m_backings.isEmpty());
 }
 
 void CCPrioritizedTextureManager::getEvictedBackings(BackingVector& evictedBackings)
 {
     ASSERT(CCProxy::isImplThread());
     evictedBackings.clear();
     evictedBackings.append(m_evictedBackings);
 }
 
 void CCPrioritizedTextureManager::unlinkEvictedBackings(const BackingVector& evictedBackings)
@@ skipping 54 matching lines @@
         texture->unlink();
         m_needsUpdateBackingsPrioritites = true;
     }
 }
 
 CCPrioritizedTexture::Backing* CCPrioritizedTextureManager::createBacking(IntSize size, GC3Denum format, CCResourceProvider* resourceProvider)
 {
     ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
     ASSERT(resourceProvider);
     CCResourceProvider::ResourceId resourceId = resourceProvider->createResource(m_pool, size, format, CCResourceProvider::TextureUsageAny);
-    CCPrioritizedTexture::Backing* backing = new CCPrioritizedTexture::Backing(resourceId, size, format);
+    CCPrioritizedTexture::Backing* backing = new CCPrioritizedTexture::Backing(resourceId, resourceProvider, size, format);
     m_memoryUseBytes += backing->bytes();
     // Put backing texture at the front for eviction, since it isn't in use yet.
     m_backings.insertBefore(m_backings.begin(), backing);
     return backing;
 }
 
 void CCPrioritizedTextureManager::evictBackingResource(CCPrioritizedTexture::Backing* backing, CCResourceProvider* resourceProvider)
 {
     ASSERT(CCProxy::isImplThread());
     ASSERT(backing);
     ASSERT(resourceProvider);
     ASSERT(m_backings.find(backing) != m_backings.end());
 
-    resourceProvider->deleteResource(backing->id());
-    backing->setId(0);
+    // 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.remove(backing);
     m_evictedBackings.append(backing);
 }
 
 #if !ASSERT_DISABLED
 void CCPrioritizedTextureManager::assertInvariants()
 {
     ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
 
@@ skipping 30 matching lines @@
         if (reachedAboveCutoff) {
             ASSERT((*it)->hadOwnerAtLastPriorityUpdate() && (*it)->wasAbovePriorityCutoffAtLastPriorityUpdate());
             ASSERT(reachedOwned);
         }
     }
 }
 #endif
 
 
 } // namespace cc