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

content/common/gpu/gpu_command_buffer_stub.h

-// 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.
 
 #ifndef CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 #pragma once
 
 #if defined(ENABLE_GPU)
 
 #include <string>
 #include <vector>
 
 #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"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/gl/gpu_preference.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/surface/transport_dib.h"
 
 #if defined(OS_MACOSX)
 #include "ui/gfx/surface/accelerated_surface_mac.h"
 #endif
 
 class GpuChannel;
 class GpuWatchdog;
 
 class GpuCommandBufferStub
     : public IPC::Channel::Listener,
       public IPC::Message::Sender,
+      public GpuMemoryManageableCommandBufferStub,
       public base::SupportsWeakPtr<GpuCommandBufferStub> {
  public:
   GpuCommandBufferStub(
       GpuChannel* channel,
       GpuCommandBufferStub* share_group,
       gfx::PluginWindowHandle handle,
       const gfx::Size& size,
       const gpu::gles2::DisallowedFeatures& disallowed_features,
       const std::string& allowed_extensions,
       const std::vector<int32>& attribs,
       gfx::GpuPreference gpu_preference,
       int32 route_id,
       int32 surface_id,
       GpuWatchdog* watchdog,
       bool software);
 
   virtual ~GpuCommandBufferStub();
 
   // IPC::Channel::Listener implementation:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // 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();
 
   // Whether this command buffer needs to be polled again in the future.
   bool HasMoreWork();
 
   // Set the swap interval according to the command line.
   void SetSwapInterval();
 
   gpu::gles2::GLES2Decoder* decoder() const { return decoder_.get(); }
@@ skipping 60 matching lines @@
 
   gfx::PluginWindowHandle handle_;
   gfx::Size initial_size_;
   gpu::gles2::DisallowedFeatures disallowed_features_;
   std::string allowed_extensions_;
   std::vector<int32> requested_attribs_;
   gfx::GpuPreference gpu_preference_;
   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_;
 
   scoped_ptr<gpu::CommandBufferService> command_buffer_;
   scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
   scoped_ptr<gpu::GpuScheduler> scheduler_;
   scoped_refptr<gfx::GLContext> context_;
   scoped_refptr<gfx::GLSurface> surface_;
 
   // SetParent may be called before Initialize, in which case we need to keep
   // around the parent stub, so that Initialize can set the parent correctly.
   base::WeakPtr<GpuCommandBufferStub> parent_stub_for_initialization_;
   uint32 parent_texture_for_initialization_;
 
   GpuWatchdog* watchdog_;
 
   // Zero or more video decoders owned by this stub, keyed by their
   // decoder_route_id.
   IDMap<GpuVideoDecodeAccelerator, IDMapOwnPointer> video_decoders_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
 };
 
 #endif  // defined(ENABLE_GPU)
 
 #endif  // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_