| Index: gpu/command_buffer/service/texture_manager.h
|
| diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h
|
| index a15714650fb07ccc10b09ebf5c9351b9cd0c5d72..33c378d558c1d9582c7f508717bdb94bfd6d3972 100644
|
| --- a/gpu/command_buffer/service/texture_manager.h
|
| +++ b/gpu/command_buffer/service/texture_manager.h
|
| @@ -20,6 +20,8 @@ namespace gles2 {
|
| class GLES2Decoder;
|
| class Display;
|
| class TextureDefinition;
|
| +class MemoryTracker;
|
| +class MemoryTypeTracker;
|
|
|
| // This class keeps track of the textures and their sizes so we can do NPOT and
|
| // texture complete checking.
|
| @@ -351,7 +353,8 @@ class GPU_EXPORT TextureManager {
|
| DISALLOW_COPY_AND_ASSIGN(TextureInfo);
|
| };
|
|
|
| - TextureManager(FeatureInfo* feature_info,
|
| + TextureManager(MemoryTracker* memory_tracker,
|
| + FeatureInfo* feature_info,
|
| GLsizei max_texture_size,
|
| GLsizei max_cube_map_texture_size);
|
| ~TextureManager();
|
| @@ -524,6 +527,8 @@ class GPU_EXPORT TextureManager {
|
| void StartTracking(TextureInfo* info);
|
| void StopTracking(TextureInfo* info);
|
|
|
| + scoped_ptr<MemoryTypeTracker> texture_memory_tracker_;
|
| +
|
| FeatureInfo::Ref feature_info_;
|
|
|
| // Info for each texture in the system.
|
| @@ -544,7 +549,6 @@ class GPU_EXPORT TextureManager {
|
| unsigned int texture_info_count_;
|
|
|
| uint32 mem_represented_;
|
| - uint32 last_reported_mem_represented_;
|
|
|
| bool have_context_;
|
|
|
|
|