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

content/common/gpu/gpu_command_buffer_stub.cc

  // 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.
 
 #if defined(ENABLE_GPU)
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/shared_memory.h"
+#include "base/time.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_messages.h"
+#include "content/common/gpu/gpu_memory_manager.h"
 #include "content/common/gpu/gpu_watchdog.h"
 #include "content/common/gpu/image_transport_surface.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 GpuCommandBufferStub::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)
     : channel_(channel),
       handle_(handle),
       initial_size_(size),
       disallowed_features_(disallowed_features),
       allowed_extensions_(allowed_extensions),
       requested_attribs_(attribs),
       gpu_preference_(gpu_preference),
       route_id_(route_id),
       software_(software),
       last_flush_count_(0),
+      surface_state_(),

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

once you get this sorted, I think you should initialize this directly with
surface_id in the constructor.

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

Done.

+      affected_surface_ids_(),
       surface_id_(surface_id),
       parent_stub_for_initialization_(),
       parent_texture_for_initialization_(0),
       watchdog_(watchdog) {
   if (share_group) {
     context_group_ = share_group->context_group_;
   } else {
     // TODO(gman): this needs to be false for everything but Pepper.
     bool bind_generates_resource = true;
     context_group_ = new gpu::gles2::ContextGroup(bind_generates_resource);
   }
+  surface_state_.surface_id = surface_id_;
 }
 
 GpuCommandBufferStub::~GpuCommandBufferStub() {
   Destroy();
 
   GpuChannelManager* gpu_channel_manager = channel_->gpu_channel_manager();
   gpu_channel_manager->Send(new GpuHostMsg_DestroyCommandBuffer(surface_id_));
 }
 
 bool GpuCommandBufferStub::OnMessageReceived(const IPC::Message& message) {
@@ skipping 79 matching lines @@
 
   if (decoder_.get()) {
     decoder_->Destroy();
     decoder_.reset();
   }
 
   command_buffer_.reset();
 
   context_ = NULL;
   surface_ = NULL;
+
+  channel_->gpu_channel_manager()->gpu_memory_manager()->ScheduleManage();
 }
 
 void GpuCommandBufferStub::OnInitializeFailed(IPC::Message* reply_message) {
   Destroy();
   GpuCommandBufferMsg_Initialize::WriteReplyParams(reply_message, false);
   Send(reply_message);
 }
 
 void GpuCommandBufferStub::OnInitialize(
     IPC::Message* reply_message) {
@@ skipping 101 matching lines @@
 
   if (parent_stub_for_initialization_) {
     decoder_->SetParent(parent_stub_for_initialization_->decoder_.get(),
                         parent_texture_for_initialization_);
     parent_stub_for_initialization_.reset();
     parent_texture_for_initialization_ = 0;
   }
 
   GpuCommandBufferMsg_Initialize::WriteReplyParams(reply_message, true);
   Send(reply_message);
+
+  surface_state_.visible = true;

[jonathan.backer, 2012/01/31 18:13:58]

If I open up a tab in the background, what happens here? And what about
last_used_time_?

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

Tabs open in the background get a "WasHidden" message sent, and the state will
be update during SetSurfaceVisibility.

Tabs open in the foreground are not sent a signal, as they are meant to default
to visible.  I shouldn't be setting this here, though, the default should be
true during construction.

As for last_used_time, I should set it along with visibility for consistency.
I wasn't setting it because (a) its only used for background tabs and (b) I
wanted to differentiate between tabs that have had visibility state changed
explicitly and those that did not.  Now we have other ways to track that.

On 2012/01/31 18:13:58, jonathan.backer wrote:

+  channel_->gpu_channel_manager()->gpu_memory_manager()->ScheduleManage();
 }
 
 void GpuCommandBufferStub::OnSetGetBuffer(
     int32 shm_id, IPC::Message* reply_message) {
   if (command_buffer_.get()) {
     command_buffer_->SetGetBuffer(shm_id);
   } else {
     DLOG(ERROR) << "no command_buffer.";
     reply_message->set_reply_error();
   }
@@ skipping 202 matching lines @@
                       channel_->renderer_process());
 }
 
 void GpuCommandBufferStub::OnDestroyVideoDecoder(int decoder_route_id) {
   channel_->RemoveRoute(decoder_route_id);
   video_decoders_.Remove(decoder_route_id);
 }
 
 void GpuCommandBufferStub::OnSetSurfaceVisible(bool visible) {
   surface_->SetVisible(visible);
+  surface_state_.visible = visible;
+  surface_state_.last_used_time = base::TimeTicks::Now();
+  channel_->gpu_channel_manager()->gpu_memory_manager()->ScheduleManage();
 }
 
 void GpuCommandBufferStub::SendConsoleMessage(
     int32 id,
     const std::string& message) {
   GPUCommandBufferConsoleMessage console_message;
   console_message.id = id;
   console_message.message = message;
   IPC::Message* msg = new GpuCommandBufferMsg_ConsoleMsg(
       route_id_, console_message);
   msg->set_unblock(true);
   Send(msg);
 }
 
+const GpuSurfaceState& GpuCommandBufferStub::surface_state() {
+  return surface_state_;
+}
+
+const std::vector<int32>& GpuCommandBufferStub::affected_surface_ids() {
+  return affected_surface_ids_;

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

does affected_surface_ids for a view-command-buffer-stub affect its own surface
id?

E.g. if this->surface.surface_id = 7, then is
  affected_surface_ids() = [] 
or
  affected_surface_ids() = [7]

Add a comment explaining clearly which it is in the .h for this method.

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

Done.

+}
+
+void GpuCommandBufferStub::SendMemoryAllocation(
+    const GpuMemoryAllocation& allocation) {
+  // TODO(mmocny): Send callback once gl extensions are added

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

sentences end with .

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

Done.

+}
+
 #endif  // defined(ENABLE_GPU)