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

content/common/gpu/gpu_command_buffer_stub.h

Index: content/common/gpu/gpu_command_buffer_stub.h
diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
index 8f4e84a0f092e32e70e6385c50471eb5f4bd7c9b..5e2867b266a214155e9c581ca58771d231820e6b 100644
--- a/content/common/gpu/gpu_command_buffer_stub.h
+++ b/content/common/gpu/gpu_command_buffer_stub.h
@@ -1,4 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -13,6 +12,7 @@
 
 #include "base/id_map.h"
 #include "base/memory/weak_ptr.h"
+#include "content/common/gpu/gpu_memory_management.h"
 #include "content/common/gpu/media/gpu_video_decode_accelerator.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
@@ -37,6 +37,7 @@ class GpuWatchdog;
 class GpuCommandBufferStub
     : public IPC::Channel::Listener,
       public IPC::Message::Sender,
+      public GpuMemoryManageableCommandBufferStub,
       public base::SupportsWeakPtr<GpuCommandBufferStub> {
  public:
   GpuCommandBufferStub(
@@ -61,6 +62,13 @@ class GpuCommandBufferStub
   // IPC::Message::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
+  // GpuMemoryManageableCommandBufferStub implementation:
+  virtual const GpuSurfaceState& surface_state() OVERRIDE;
+  virtual const std::vector<int32>& affected_surface_ids() OVERRIDE;
+  virtual void SendMemoryAllocation(
+      const GpuMemoryAllocation& allocation) OVERRIDE;
+
+
   // Whether this command buffer can currently handle IPC messages.
   bool IsScheduled();
 
@@ -141,6 +149,8 @@ class GpuCommandBufferStub
   int32 route_id_;
   bool software_;
   uint32 last_flush_count_;
+  GpuSurfaceState surface_state_;

[nduca, 2012/01/31 06:53:47]

Isn't there a surface_id_ on this class already? Lets avoid having duplication
between surface_state_ and fields on the stub

[nduca, 2012/01/31 06:53:47]

The whole point of this structure is to have it be null when there's no
surface... E.g. this should be a scoped_ptr<SurfaceState>

Also, I'm a little confused about the GLSurface* --- that maybe should just be
on the surface state. E.g.

 Stub {
  Surface {
     GLSurface* gl_surface;
     int surface_id;
     ....
  }
  scoped_ptr<Surface> surface_;
}

I.e. no duplication on the stub.

[mmocny, 2012/01/31 18:54:57]

Done.

[mmocny, 2012/01/31 18:54:57]

GpuMemoryManager doesn't need to know about GLSurface and also, what other
members should be changed if GLSurface* is moved..
I don't disagree that this may be correct, but I think it should be out of scope
for this CL.

On 2012/01/31 06:53:47, nduca wrote:

+  std::vector<int32> affected_surface_ids_;
 
   // Identifies the window for the rendering results on the browser side.
   int32 surface_id_;