Adding GpuMemoryManager to track GpuCommandBufferStub visibility and last_used_time and dictate mem…

content/common/gpu/gpu_channel_manager.h

Index: content/common/gpu/gpu_channel_manager.h
diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h
index f48c53803aaee951895043509ec8507f001a0584..567a44f23429e9084b120fd7ccc0712cba00966b 100644
--- a/content/common/gpu/gpu_channel_manager.h
+++ b/content/common/gpu/gpu_channel_manager.h
@@ -11,6 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "build/build_config.h"
+#include "content/common/gpu/gpu_memory_manager.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
 #include "ui/gfx/native_widget_types.h"
@@ -39,7 +40,8 @@ struct GPUCreateCommandBufferConfig;
 // to send IPC messages to the browser process IO thread on the
 // GpuChannelManager's behalf.
 class GpuChannelManager : public IPC::Channel::Listener,
-                          public IPC::Message::Sender {
+                          public IPC::Message::Sender,
+                          public GpuMemoryManagerClient {
  public:
   GpuChannelManager(ChildThread* gpu_child_thread,
                     GpuWatchdog* watchdog,
@@ -56,6 +58,10 @@ class GpuChannelManager : public IPC::Channel::Listener,
   // Sender overrides.
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
+  // GpuMemoryManagerClient overrides.
+  virtual void AppendAllCommandBufferStubs(
+      std::vector<GpuCommandBufferStubBase*>& stubs) OVERRIDE;
+
   void LoseAllContexts();
 
   base::WeakPtrFactory<GpuChannelManager> weak_factory_;
@@ -64,6 +70,8 @@ class GpuChannelManager : public IPC::Channel::Listener,
   void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
   void RemoveRoute(int32 routing_id);
 
+  GpuMemoryManager* gpu_memory_manager() { return &gpu_memory_manager_; }
+
   GpuChannel* LookupChannel(int32 client_id);
 
  private:
@@ -91,6 +99,7 @@ class GpuChannelManager : public IPC::Channel::Listener,
   // process.
   typedef base::hash_map<int, scoped_refptr<GpuChannel> > GpuChannelMap;
   GpuChannelMap gpu_channels_;
+  GpuMemoryManager gpu_memory_manager_;
   GpuWatchdog* watchdog_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelManager);