| Index: cc/prioritized_texture_manager.h | 
| diff --git a/cc/prioritized_texture_manager.h b/cc/prioritized_texture_manager.h | 
| index 47f283ab664ad4e98b287e0bc3c9a6b77d021fc1..2a4c41c4c69fefe9d0de48f5e7dcd721908ffa1f 100644 | 
| --- a/cc/prioritized_texture_manager.h | 
| +++ b/cc/prioritized_texture_manager.h | 
| @@ -13,6 +13,7 @@ | 
| #include "base/basictypes.h" | 
| #include "base/hash_tables.h" | 
| #include "base/memory/scoped_ptr.h" | 
| +#include "cc/proxy.h" | 
| #include "cc/prioritized_texture.h" | 
| #include "cc/priority_calculator.h" | 
| #include "cc/texture.h" | 
| @@ -32,12 +33,13 @@ struct hash<cc::PrioritizedTexture*> { | 
| namespace cc { | 
|  | 
| class PriorityCalculator; | 
| +class Proxy; | 
|  | 
| class PrioritizedTextureManager { | 
| public: | 
| -    static scoped_ptr<PrioritizedTextureManager> create(size_t maxMemoryLimitBytes, int maxTextureSize, int pool) | 
| +    static scoped_ptr<PrioritizedTextureManager> create(size_t maxMemoryLimitBytes, int maxTextureSize, int pool, const Proxy* proxy) | 
| { | 
| -        return make_scoped_ptr(new PrioritizedTextureManager(maxMemoryLimitBytes, maxTextureSize, pool)); | 
| +        return make_scoped_ptr(new PrioritizedTextureManager(maxMemoryLimitBytes, maxTextureSize, pool, proxy)); | 
| } | 
| scoped_ptr<PrioritizedTexture> createTexture(IntSize size, GLenum format) | 
| { | 
| @@ -138,7 +140,7 @@ private: | 
| return a < b; | 
| } | 
|  | 
| -    PrioritizedTextureManager(size_t maxMemoryLimitBytes, int maxTextureSize, int pool); | 
| +    PrioritizedTextureManager(size_t maxMemoryLimitBytes, int maxTextureSize, int pool, const Proxy* proxy); | 
|  | 
| bool evictBackingsToReduceMemory(size_t limitBytes, int priorityCutoff, EvictionPolicy, ResourceProvider*); | 
| PrioritizedTexture::Backing* createBacking(IntSize, GLenum format, ResourceProvider*); | 
| @@ -164,6 +166,8 @@ private: | 
| 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 | 
|  |