Enable removing uploads to evicted textures from texture upload queues.

cc/CCPrioritizedTexture.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 "CCPrioritizedTexture.h"
 
 #include "CCPrioritizedTextureManager.h"
 #include "CCPriorityCalculator.h"
@@ skipping 51 matching lines @@
     }
 }
 
 bool CCPrioritizedTexture::requestLate()
 {
     if (!m_manager)
         return false;
     return m_manager->requestLate(this);
 }
 
+bool CCPrioritizedTexture::backingResourceWasEvicted() const
+{
+    return m_backing ? m_backing->resourceHasBeenDeleted() : false;
+}
+
 void CCPrioritizedTexture::acquireBackingTexture(CCResourceProvider* resourceProvider)
 {
     ASSERT(m_isAbovePriorityCutoff);
     if (m_isAbovePriorityCutoff)
         m_manager->acquireBackingTextureIfNeeded(this, resourceProvider);
 }
 
 CCResourceProvider::ResourceId CCPrioritizedTexture::resourceId() const
 {
     if (m_backing)
@@ skipping 31 matching lines @@
     m_backing = 0;
 }
 
 void CCPrioritizedTexture::setToSelfManagedMemoryPlaceholder(size_t bytes)
 {
     setDimensions(IntSize(), GraphicsContext3D::RGBA);
     setIsSelfManaged(true);
     m_bytes = bytes;
 }
 
-CCPrioritizedTexture::Backing::Backing(unsigned id, IntSize size, GC3Denum format)
+CCPrioritizedTexture::Backing::Backing(unsigned id, CCResourceProvider* resourceProvider, IntSize size, GC3Denum format)
     : CCTexture(id, size, format)
     , m_owner(0)
     , m_priorityAtLastPriorityUpdate(CCPriorityCalculator::lowestPriority())
     , m_ownerExistedAtLastPriorityUpdate(false)
     , m_wasAbovePriorityCutoffAtLastPriorityUpdate(false)
+    , m_resourceHasBeenDeleted(false)
+#ifndef NDEBUG
+    , m_resourceProvider(resourceProvider)
+#endif
 {
 }
 
 CCPrioritizedTexture::Backing::~Backing()
 {
     ASSERT(!m_owner);
+    ASSERT(m_resourceHasBeenDeleted);
+}
+
+void CCPrioritizedTexture::Backing::deleteResource(CCResourceProvider* resourceProvider)
+{
+    ASSERT(CCProxy::isImplThread());
+    ASSERT(!m_resourceHasBeenDeleted);
+#ifndef NDEBUG
+    ASSERT(resourceProvider == m_resourceProvider);
+#endif
+
+    resourceProvider->deleteResource(id());
+    setId(0);
+    m_resourceHasBeenDeleted = true;
+}
+
+bool CCPrioritizedTexture::Backing::resourceHasBeenDeleted() const
+{
+    ASSERT(CCProxy::isImplThread());
+    return m_resourceHasBeenDeleted;
 }
 
 void CCPrioritizedTexture::Backing::updatePriority()
 {
     ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
     if (m_owner) {
         m_ownerExistedAtLastPriorityUpdate = true;
         m_priorityAtLastPriorityUpdate = m_owner->requestPriority();
         m_wasAbovePriorityCutoffAtLastPriorityUpdate = m_owner->isAbovePriorityCutoff();
     } else {
         m_ownerExistedAtLastPriorityUpdate = false;
         m_priorityAtLastPriorityUpdate = CCPriorityCalculator::lowestPriority();
         m_wasAbovePriorityCutoffAtLastPriorityUpdate = false;
     }
 }
 
 } // namespace cc