Add tracing of all memory allocated in all contexts

gpu/command_buffer/service/texture_manager.cc

Index: gpu/command_buffer/service/texture_manager.cc
diff --git a/gpu/command_buffer/service/texture_manager.cc b/gpu/command_buffer/service/texture_manager.cc
index fbbdec6b91f0e203adff5b9523eec40e957dee12..5cf7a0a25d22b9d8a34cac35f0630016abfccbcd 100644
--- a/gpu/command_buffer/service/texture_manager.cc
+++ b/gpu/command_buffer/service/texture_manager.cc
@@ -4,11 +4,12 @@
 
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "base/bits.h"
-#include "base/debug/trace_event.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
+#include "gpu/command_buffer/service/context_group.h"

[greggman, 2012/07/27 19:39:43]

Is this still needed?

[ccameron, 2012/07/27 20:14:34]

Nope, torched.

 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
+#include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/command_buffer/service/texture_definition.h"
 
 namespace gpu {
@@ -589,10 +590,15 @@ bool TextureManager::TextureInfo::ClearLevel(
 }
 
 TextureManager::TextureManager(
+    MemoryTracker* memory_tracker,
     FeatureInfo* feature_info,
     GLint max_texture_size,
     GLint max_cube_map_texture_size)
-    : feature_info_(feature_info),
+    : texture_memory_tracker_(new MemoryTypeTracker(
+        memory_tracker,
+        "TextureManager",
+        "TextureMemory")),
+      feature_info_(feature_info),
       max_texture_size_(max_texture_size),
       max_cube_map_texture_size_(max_cube_map_texture_size),
       max_levels_(ComputeMipMapCount(max_texture_size,
@@ -606,7 +612,6 @@ TextureManager::TextureManager(
       num_uncleared_mips_(0),
       texture_info_count_(0),
       mem_represented_(0),
-      last_reported_mem_represented_(1),
       have_context_(true) {
   for (int ii = 0; ii < kNumDefaultTextures; ++ii) {
     black_texture_ids_[ii] = 0;
@@ -614,11 +619,7 @@ TextureManager::TextureManager(
 }
 
 void TextureManager::UpdateMemRepresented() {
-  if (mem_represented_ != last_reported_mem_represented_) {
-    last_reported_mem_represented_ = mem_represented_;
-    TRACE_COUNTER_ID1(
-        "TextureManager", "TextureMemory", this, mem_represented_);
-  }
+  texture_memory_tracker_->UpdateMemRepresented(mem_represented_);
 }
 
 bool TextureManager::Initialize() {