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

content/common/gpu/gpu_channel.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_CHANNEL_H_
 #define CONTENT_COMMON_GPU_GPU_CHANNEL_H_
 #pragma once
 
 #include <deque>
 #include <string>
 
 #include "base/id_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
+#include "content/common/gpu/gpu_memory_manager.h"
 #include "content/common/message_router.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ui/gfx/gl/gl_share_group.h"
 #include "ui/gfx/gl/gpu_preference.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 
 class GpuChannelManager;
 struct GPUCreateCommandBufferConfig;
 class GpuWatchdog;
 
 namespace base {
 class MessageLoopProxy;
 class WaitableEvent;
 }
 
 // Encapsulates an IPC channel between the GPU process and one renderer
 // process. On the renderer side there's a corresponding GpuChannelHost.
 class GpuChannel : public IPC::Channel::Listener,
                    public IPC::Message::Sender,
+                   public GpuMemoryManagerClient,

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

Necessary?

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

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

                    public base::RefCountedThreadSafe<GpuChannel> {
  public:
   // Takes ownership of the renderer process handle.
   GpuChannel(GpuChannelManager* gpu_channel_manager,
              GpuWatchdog* watchdog,
              gfx::GLShareGroup* share_group,
              int client_id,
              bool software);
   virtual ~GpuChannel();
 
@@ skipping 17 matching lines @@
   }
 
   // IPC::Channel::Listener implementation:
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
 
   // IPC::Message::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
+  // GpuMemoryManagerClient implementation:
+  virtual void AppendAllCommandBufferStubs(

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

Overkill. Just append them all. Then filter then as a second pass inside the
consumer.

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

Done.

+      std::vector<GpuMemoryManageableCommandBufferStub*>& stubs_with_surface,
+      std::vector<GpuMemoryManageableCommandBufferStub*>& stubs_without_surface)
+          OVERRIDE;
+
   // Whether this channel is able to handle IPC messages.
   bool IsScheduled();
 
   // This is called when a command buffer transitions from the unscheduled
   // state to the scheduled state, which potentially means the channel
   // transitions from the unscheduled to the scheduled state. When this occurs
   // deferred IPC messaged are handled.
   void OnScheduled();
 
   void CreateViewCommandBuffer(
@@ skipping 87 matching lines @@
   bool handle_messages_scheduled_;
   bool processed_get_state_fast_;
   int32 num_contexts_preferring_discrete_gpu_;
 
   base::WeakPtrFactory<GpuChannel> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannel);
 };
 
 #endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_H_