Remove use of wtf/ListHashSet from CCPrioritizedTextureManager.

cc/prioritized_texture_manager.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 CCPrioritizedTextureManager_h
 #define CCPrioritizedTextureManager_h
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "CCPrioritizedTexture.h"
 #include "CCPriorityCalculator.h"
 #include "CCTexture.h"
 #include "GraphicsContext3D.h"
 #include "IntRect.h"
 #include "IntSize.h"
-#include <wtf/ListHashSet.h>
 #include <wtf/Vector.h>
+#include <list>
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
 template<>
 struct hash<cc::CCPrioritizedTexture*> {
   size_t operator()(cc::CCPrioritizedTexture* ptr) const {
     return hash<size_t>()(reinterpret_cast<size_t>(ptr));
   }
 };
 } // namespace BASE_HASH_NAMESPACE
 #endif // COMPILER
 
 namespace cc {
 
 class CCPriorityCalculator;
 
 class CCPrioritizedTextureManager {
 public:
     static scoped_ptr<CCPrioritizedTextureManager> create(size_t maxMemoryLimitBytes, int maxTextureSize, int pool)
     {
         return make_scoped_ptr(new CCPrioritizedTextureManager(maxMemoryLimitBytes, maxTextureSize, pool));
     }
     scoped_ptr<CCPrioritizedTexture> createTexture(IntSize size, GC3Denum format)
     {
         return make_scoped_ptr(new CCPrioritizedTexture(this, size, format));
     }
     ~CCPrioritizedTextureManager();
 
-    typedef Vector<CCPrioritizedTexture::Backing*> BackingVector;
+    typedef std::list<CCPrioritizedTexture::Backing*> BackingList;
 
     // FIXME (http://crbug.com/137094): This 64MB default is a straggler from the
     // old texture manager and is just to give us a default memory allocation before
     // we get a callback from the GPU memory manager. We should probaby either:
     // - wait for the callback before rendering anything instead
     // - push this into the GPU memory manager somehow.
     static size_t defaultMemoryAllocationLimit() { return 64 * 1024 * 1024; }
 
     // memoryUseBytes() describes the number of bytes used by existing allocated textures.
     // memoryAboveCutoffBytes() describes the number of bytes that would be used if all
@@ skipping 11 matching lines @@
 
     // Delete contents textures' backing resources until they use only bytesLimit bytes. This may
     // be called on the impl thread while the main thread is running.
     void reduceMemoryOnImplThread(size_t limitBytes, CCResourceProvider*);
     // Returns true if there exist any textures that are linked to backings that have had their
     // resources evicted. Only when we commit a tree that has no textures linked to evicted backings
     // may we allow drawing.
     bool linkedEvictedBackingsExist() const;
     // Retrieve the list of all contents textures' backings that have been evicted, to pass to the
     // main thread to unlink them from their owning textures.
-    void getEvictedBackings(BackingVector& evictedBackings);
+    void getEvictedBackings(BackingList& evictedBackings);
     // Unlink the list of contents textures' backings from their owning textures on the main thread
     // before updating layers.
-    void unlinkEvictedBackings(const BackingVector& evictedBackings);
+    void unlinkEvictedBackings(const BackingList& evictedBackings);
 
     bool requestLate(CCPrioritizedTexture*);
 
     void reduceMemory(CCResourceProvider*);
     void clearAllMemory(CCResourceProvider*);
 
     void acquireBackingTextureIfNeeded(CCPrioritizedTexture*, CCResourceProvider*);
 
     void registerTexture(CCPrioritizedTexture*);
     void unregisterTexture(CCPrioritizedTexture*);
@@ skipping 36 matching lines @@
         // Finally sort by being in the impl tree versus being completely unreferenced
         if (a->inDrawingImplTree() != b->inDrawingImplTree())
             return (a->inDrawingImplTree() < b->inDrawingImplTree());
         return a < b;
     }
 
     CCPrioritizedTextureManager(size_t maxMemoryLimitBytes, int maxTextureSize, int pool);
 
     void evictBackingsToReduceMemory(size_t limitBytes, EvictionPriorityPolicy, CCResourceProvider*);
     CCPrioritizedTexture::Backing* createBacking(IntSize, GC3Denum format, CCResourceProvider*);
-    void evictBackingResource(CCPrioritizedTexture::Backing*, CCResourceProvider*);
+    void evictFirstBackingResource(CCResourceProvider*);
     void deleteUnlinkedEvictedBackings();
     void sortBackings();
 
-#if !ASSERT_DISABLED
     void assertInvariants();
-#endif
 
     size_t m_maxMemoryLimitBytes;
     unsigned m_priorityCutoff;
     size_t m_memoryUseBytes;
     size_t m_memoryAboveCutoffBytes;
     size_t m_memoryAvailableBytes;
     int m_pool;
 
     typedef base::hash_set<CCPrioritizedTexture*> TextureSet;
-    typedef ListHashSet<CCPrioritizedTexture::Backing*> BackingSet;
     typedef Vector<CCPrioritizedTexture*> TextureVector;
 
     TextureSet m_textures;
-    BackingSet m_backings;
-    BackingVector m_evictedBackings;
+    // This list is always sorted in eviction order, with the exception the
+    // newly-allocated or recycled textures at the very end of the tail that 
+    // are not sorted by priority.
+    BackingList m_backings;
+    bool m_backingsTailNotSorted;
+    BackingList m_evictedBackings;
 
     TextureVector m_tempTextureVector;
-    BackingVector m_tempBackingVector;
 
     DISALLOW_COPY_AND_ASSIGN(CCPrioritizedTextureManager);
 };
 
 }  // namespace cc
 
 #endif