A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2

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 CC_PRIORITIZED_TEXTURE_MANAGER_H_
 #define CC_PRIORITIZED_TEXTURE_MANAGER_H_
 
 #include <list>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/cc_export.h"
-#include "cc/proxy.h"
 #include "cc/prioritized_texture.h"
 #include "cc/priority_calculator.h"
 #include "cc/texture.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/size.h"
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
 template<>
 struct hash<cc::PrioritizedTexture*> {
   size_t operator()(cc::PrioritizedTexture* ptr) const {
     return hash<size_t>()(reinterpret_cast<size_t>(ptr));
   }
 };
 } // namespace BASE_HASH_NAMESPACE
 #endif // COMPILER
 
 namespace cc {
 
 class PriorityCalculator;
-class Proxy;
 
 class CC_EXPORT PrioritizedTextureManager {
 public:
-    static scoped_ptr<PrioritizedTextureManager> create(size_t maxMemoryLimitBytes, int maxTextureSize, int pool, const Proxy* proxy)
+    static scoped_ptr<PrioritizedTextureManager> create(size_t maxMemoryLimitBytes, int maxTextureSize, int pool)
     {
-        return make_scoped_ptr(new PrioritizedTextureManager(maxMemoryLimitBytes, maxTextureSize, pool, proxy));
+        return make_scoped_ptr(new PrioritizedTextureManager(maxMemoryLimitBytes, maxTextureSize, pool));
     }
     scoped_ptr<PrioritizedTexture> createTexture(gfx::Size size, GLenum format)
     {
         return make_scoped_ptr(new PrioritizedTexture(this, size, format));
     }
     ~PrioritizedTextureManager();
 
     typedef std::list<PrioritizedTexture::Backing*> BackingList;
 
     // FIXME (http://crbug.com/137094): This 64MB default is a straggler from the
@@ skipping 50 matching lines @@
     void registerTexture(PrioritizedTexture*);
     void unregisterTexture(PrioritizedTexture*);
     void returnBackingTexture(PrioritizedTexture*);
 
     // Update all backings' priorities from their owning texture.
     void pushTexturePrioritiesToBackings();
 
     // Mark all textures' backings as being in the drawing impl tree.
     void updateBackingsInDrawingImplTree();
 
-    const Proxy* proxyForDebug() const;
-
 private:
     friend class PrioritizedTextureTest;
 
     enum EvictionPolicy {
         EvictOnlyRecyclable,
         EvictAnything,
     };
 
     // Compare textures. Highest priority first.
     static inline bool compareTextures(PrioritizedTexture* a, PrioritizedTexture* b)
@@ skipping 14 matching lines @@
         // Then sort by priority (note that backings that no longer have owners will
         // always have the lowest priority)
         if (a->requestPriorityAtLastPriorityUpdate() != b->requestPriorityAtLastPriorityUpdate())
             return PriorityCalculator::priorityIsLower(a->requestPriorityAtLastPriorityUpdate(), b->requestPriorityAtLastPriorityUpdate());
         // 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;
     }
 
-    PrioritizedTextureManager(size_t maxMemoryLimitBytes, int maxTextureSize, int pool, const Proxy* proxy);
+    PrioritizedTextureManager(size_t maxMemoryLimitBytes, int maxTextureSize, int pool);
 
     bool evictBackingsToReduceMemory(size_t limitBytes, int priorityCutoff, EvictionPolicy, ResourceProvider*);
     PrioritizedTexture::Backing* createBacking(gfx::Size, GLenum format, ResourceProvider*);
     void evictFirstBackingResource(ResourceProvider*);
     void deleteUnlinkedEvictedBackings();
     void sortBackings();
 
     void assertInvariants();
 
     size_t m_maxMemoryLimitBytes;
     // The priority cutoff based on memory pressure. This is not a strict
     // cutoff -- requestLate allows textures with priority equal to this
     // cutoff to be allowed.
     int m_priorityCutoff;
     // The priority cutoff based on external memory policy. This is a strict
     // cutoff -- no textures with priority equal to this cutoff will be allowed.
     int m_externalPriorityCutoff;
     size_t m_memoryUseBytes;
     size_t m_memoryAboveCutoffBytes;
     size_t m_memoryAvailableBytes;
     int m_pool;
 
     typedef base::hash_set<PrioritizedTexture*> TextureSet;
     typedef std::vector<PrioritizedTexture*> TextureVector;
 
-    const Proxy* m_proxy;
-
     TextureSet m_textures;
     // 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;
 
     // Statistics about memory usage at priority cutoffs, computed at prioritizeTextures.
     size_t m_memoryVisibleBytes;
     size_t m_memoryVisibleAndNearbyBytes;
 
     // Statistics copied at the time of pushTexturePrioritiesToBackings.
     size_t m_memoryVisibleLastPushedBytes;
     size_t m_memoryVisibleAndNearbyLastPushedBytes;
 
     DISALLOW_COPY_AND_ASSIGN(PrioritizedTextureManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_PRIORITIZED_TEXTURE_MANAGER_H_