Enable removing uploads to evicted textures from texture upload queues.

cc/CCPrioritizedTexture.h

 // 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.
 
 #ifndef CCPrioritizedTexture_h
 #define CCPrioritizedTexture_h
 
 #include "CCPriorityCalculator.h"
 #include "CCResourceProvider.h"
 #include "CCTexture.h"
@@ skipping 34 matching lines @@
     // After CCPrioritizedTexture::prioritizeTextures() is called, this returns
     // if the the request succeeded and this texture can be acquired for use.
     bool canAcquireBackingTexture() const { return m_isAbovePriorityCutoff; }
 
     // This returns whether we still have a backing texture. This can continue
     // to be true even after canAcquireBackingTexture() becomes false. In this
     // case the texture can be used but shouldn't be updated since it will get
     // taken away "soon".
     bool haveBackingTexture() const { return !!backing(); }
 
+    bool backingResourceWasEvicted() const { return m_backing ? m_backing->resourceHasBeenDeleted() : false; }

[jamesr, 2012/09/19 18:56:37]

a ternary is about the place where I'd prefer putting the function definition in
the cpp

[ccameron, 2012/09/19 20:52:02]

Fixed

+
     // If canAcquireBackingTexture() is true acquireBackingTexture() will acquire
     // a backing texture for use. Call this whenever the texture is actually needed.
     void acquireBackingTexture(CCResourceProvider*);
 
     // FIXME: Request late is really a hack for when we are totally out of memory
     //        (all textures are visible) but we can still squeeze into the limit
     //        by not painting occluded textures. In this case the manager
     //        refuses all visible textures and requestLate() will enable
     //        canAcquireBackingTexture() on a call-order basis. We might want to
     //        just remove this in the future (carefully) and just make sure we don't
@@ skipping 22 matching lines @@
     public:
         Backing(unsigned id, IntSize, GC3Denum format);
         ~Backing();
         void updatePriority();
 
         CCPrioritizedTexture* owner() { return m_owner; }
         bool hadOwnerAtLastPriorityUpdate() const { return m_ownerExistedAtLastPriorityUpdate; }
         bool requestPriorityAtLastPriorityUpdate() const { return m_priorityAtLastPriorityUpdate; }
         bool wasAbovePriorityCutoffAtLastPriorityUpdate() const { return m_wasAbovePriorityCutoffAtLastPriorityUpdate; }
 
+        void deleteResource(CCResourceProvider*);
+        bool resourceHasBeenDeleted() const;
+
     private:
         friend class CCPrioritizedTexture;
         CCPrioritizedTexture* m_owner;
         int m_priorityAtLastPriorityUpdate;
         bool m_ownerExistedAtLastPriorityUpdate;
         bool m_wasAbovePriorityCutoffAtLastPriorityUpdate;
+        bool m_resourceHasBeenDeleted;
     };
 
     CCPrioritizedTexture(CCPrioritizedTextureManager*, IntSize, GC3Denum format);
 
     bool isAbovePriorityCutoff() { return m_isAbovePriorityCutoff; }
     void setAbovePriorityCutoff(bool isAbovePriorityCutoff) { m_isAbovePriorityCutoff = isAbovePriorityCutoff; }
     void setManagerInternal(CCPrioritizedTextureManager* manager) { m_manager = manager; }
 
     Backing* backing() const { return m_backing; }
     void link(Backing*);
     void unlink();
 
     IntSize m_size;
     GC3Denum m_format;
     size_t m_bytes;
 
     int m_priority;
     bool m_isAbovePriorityCutoff;
     bool m_isSelfManaged;
 
     Backing* m_backing;
     CCPrioritizedTextureManager* m_manager;
 };
 
 } // namespace cc
 
 #endif