Index: cc/prioritized_texture_manager.h |
=================================================================== |
--- cc/prioritized_texture_manager.h (revision 165906) |
+++ cc/prioritized_texture_manager.h (working copy) |
@@ -12,7 +12,6 @@ |
#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" |
@@ -33,13 +32,12 @@ |
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) |
{ |
@@ -110,8 +108,6 @@ |
// Mark all textures' backings as being in the drawing impl tree. |
void updateBackingsInDrawingImplTree(); |
- const Proxy* proxyForDebug() const; |
- |
private: |
friend class PrioritizedTextureTest; |
@@ -146,7 +142,7 @@ |
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*); |
@@ -172,8 +168,6 @@ |
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 |