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
@@ skipping 100 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(CCPrioritizedTexture::Backing*, 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 std::list<CCPrioritizedTexture::Backing*> BackingList;
     typedef Vector<CCPrioritizedTexture*> TextureVector;
 
     TextureSet m_textures;
-    BackingSet m_backings;
+    // This list is always sorted in eviction order, with the exception the
+    // newly-allocated textures at the very end of the tail that are not
+    // sorted by priority.
+    BackingList m_backings;
     BackingVector m_evictedBackings;

[jamesr, 2012/10/17 01:31:11]

Does the m_evictedBackings need O(1) access or could it be the same type as
m_backings?  The access patterns seem pretty similar

[ccameron, 2012/10/17 02:13:58]

Nah, it can be a list too.  Updated.

 
     TextureVector m_tempTextureVector;
-    BackingVector m_tempBackingVector;
 
     DISALLOW_COPY_AND_ASSIGN(CCPrioritizedTextureManager);
 };
 
 }  // namespace cc
 
 #endif