| Index: cc/prioritized_texture_manager.h
|
| diff --git a/cc/prioritized_texture_manager.h b/cc/prioritized_texture_manager.h
|
| index 47f283ab664ad4e98b287e0bc3c9a6b77d021fc1..60d24278d6e5adb446b76f15ecf7d4ce9c9494f9 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)
|
| {
|
| @@ -104,6 +106,8 @@ public:
|
| // Mark all textures' backings as being in the drawing impl tree.
|
| void updateBackingsInDrawingImplTree();
|
|
|
| + const Proxy* proxyForDebug() const;
|
| +
|
| private:
|
| friend class PrioritizedTextureTest;
|
|
|
| @@ -138,7 +142,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 +168,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
|
|
|