Splitting GpuMemoryAllocation into two parts: for renderer and browser

content/common/gpu/client/command_buffer_proxy.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_CLIENT_COMMAND_BUFFER_PROXY_H_
 #define CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_H_
 #pragma once
 
 #if defined(ENABLE_GPU)
 
 #include <map>
 #include <queue>
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/gpu/client/gpu_video_decode_accelerator_host.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/command_buffer/common/command_buffer_shared.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
 
 class GpuChannelHost;
 struct GPUCommandBufferConsoleMessage;
-class GpuMemoryAllocation;
+struct GpuMemoryAllocationForRenderer;
 
 namespace base {
 class SharedMemory;
 }
 
 // Client side proxy that forwards messages synchronously to a
 // CommandBufferStub.
 class CommandBufferProxy : public gpu::CommandBuffer,
                            public IPC::Channel::Listener,
                            public base::SupportsWeakPtr<CommandBufferProxy> {
@@ skipping 31 matching lines @@
 
   // Invoke the task when the channel has been flushed. Takes care of deleting
   // the task whether the echo succeeds or not.
   bool Echo(const base::Closure& callback);
 
   // Sends an IPC message with the new state of surface visibility.
   bool SetSurfaceVisible(bool visible);
 
   // Register a callback to invoke whenever we recieve a new memory allocation.
   void SetMemoryAllocationChangedCallback(
-      const base::Callback<void(const GpuMemoryAllocation&)>& callback);
+      const base::Callback<void(const GpuMemoryAllocationForRenderer&)>&
+          callback);
 
   // Reparent a command buffer. TODO(apatrick): going forward, the notion of
   // the parent / child relationship between command buffers is going away in
   // favor of the notion of surfaces that can be drawn to in one command buffer
   // and bound as a texture in any other.
   virtual bool SetParent(CommandBufferProxy* parent_command_buffer,
                          uint32 parent_texture_id);
 
   void SetChannelErrorCallback(const base::Closure& callback);
 
@@ skipping 26 matching lines @@
   // encapsulate the channel; all callers of this function must explicitly
   // verify that the context has not been lost.
   bool Send(IPC::Message* msg);
 
   // Message handlers:
   void OnUpdateState(const gpu::CommandBuffer::State& state);
   void OnNotifyRepaint();
   void OnDestroyed(gpu::error::ContextLostReason reason);
   void OnEchoAck();
   void OnConsoleMessage(const GPUCommandBufferConsoleMessage& message);
-  void OnSetMemoryAllocation(const GpuMemoryAllocation& allocation);
+  void OnSetMemoryAllocation(const GpuMemoryAllocationForRenderer& allocation);
 
   // Try to read an updated copy of the state from shared memory.
   void TryUpdateState();
 
   // Local cache of id to transfer buffer mapping.
   typedef std::map<int32, gpu::Buffer> TransferBufferMap;
   TransferBufferMap transfer_buffers_;
 
   // Zero or more video decoder hosts owned by this proxy, keyed by their
   // decoder_route_id.
@@ skipping 13 matching lines @@
   unsigned int flush_count_;
   int32 last_put_offset_;
 
   // Tasks to be invoked in echo responses.
   std::queue<base::Closure> echo_tasks_;
 
   base::Closure notify_repaint_task_;
 
   base::Closure channel_error_callback_;
 
-  base::Callback<void(const GpuMemoryAllocation&)>
+  base::Callback<void(const GpuMemoryAllocationForRenderer&)>
       memory_allocation_changed_callback_;
 
   GpuConsoleMessageCallback console_message_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferProxy);
 };
 
 #endif  // ENABLE_GPU
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_H_