Fix layering violation where content is included by gpu.

content/common/gpu/client/command_buffer_proxy_impl.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_IMPL_H_
 #define CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_
 
 #if defined(ENABLE_GPU)
 
 #include <map>
 #include <queue>
 #include <string>
 
 #include "gpu/ipc/command_buffer_proxy.h"
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/gpu/client/gpu_video_decode_accelerator_host.h"
+#include "content/common/gpu/gpu_memory_allocation.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/command_buffer/common/command_buffer_shared.h"
 #include "ipc/ipc_listener.h"
 
 struct GPUCommandBufferConsoleMessage;
 
 namespace base {
 class SharedMemory;
 }
 
 namespace content {
 class GpuChannelHost;
-struct GpuMemoryAllocationForRenderer;
 
 // Client side proxy that forwards messages synchronously to a
 // CommandBufferStub.
 class CommandBufferProxyImpl
     : public CommandBufferProxy,
       public IPC::Listener,
       public base::SupportsWeakPtr<CommandBufferProxyImpl> {
  public:
   typedef base::Callback<void(
       const std::string& msg, int id)> GpuConsoleMessageCallback;
@@ skipping 11 matching lines @@
       media::VideoCodecProfile profile,
       media::VideoDecodeAccelerator::Client* client);
 
   // IPC::Listener implementation:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
   // CommandBufferProxy implementation:
   virtual int GetRouteID() const OVERRIDE;
   virtual bool Echo(const base::Closure& callback) OVERRIDE;
-  virtual bool SetSurfaceVisible(bool visible) OVERRIDE;
-  virtual bool DiscardBackbuffer() OVERRIDE;
-  virtual bool EnsureBackbuffer() OVERRIDE;
-  virtual uint32 InsertSyncPoint() OVERRIDE;
-  virtual void WaitSyncPoint(uint32 sync_point) OVERRIDE;
-  virtual bool SignalSyncPoint(uint32 sync_point,
-                               const base::Closure& callback) OVERRIDE;
-  virtual void SetMemoryAllocationChangedCallback(
-      const base::Callback<void(const GpuMemoryAllocationForRenderer&)>&
-          callback) OVERRIDE;
   virtual bool SetParent(CommandBufferProxy* parent_command_buffer,
                          uint32 parent_texture_id) OVERRIDE;
   virtual void SetChannelErrorCallback(const base::Closure& callback) OVERRIDE;
-  virtual void SetNotifyRepaintTask(const base::Closure& callback) OVERRIDE;
-  virtual void SetOnConsoleMessageCallback(
-      const GpuConsoleMessageCallback& callback) OVERRIDE;
 
   // CommandBuffer implementation:
   virtual bool Initialize() OVERRIDE;
   virtual State GetState() OVERRIDE;
   virtual State GetLastState() OVERRIDE;
   virtual void Flush(int32 put_offset) OVERRIDE;
   virtual State FlushSync(int32 put_offset, int32 last_known_get) OVERRIDE;
   virtual void SetGetBuffer(int32 shm_id) OVERRIDE;
   virtual void SetGetOffset(int32 get_offset) OVERRIDE;
   virtual int32 CreateTransferBuffer(size_t size, int32 id_request) OVERRIDE;
   virtual int32 RegisterTransferBuffer(base::SharedMemory* shared_memory,
                                        size_t size,
                                        int32 id_request) OVERRIDE;
   virtual void DestroyTransferBuffer(int32 id) OVERRIDE;
   virtual gpu::Buffer GetTransferBuffer(int32 handle) OVERRIDE;
   virtual void SetToken(int32 token) OVERRIDE;
   virtual void SetParseError(gpu::error::Error error) OVERRIDE;
   virtual void SetContextLostReason(
       gpu::error::ContextLostReason reason) OVERRIDE;
 
+  void SetMemoryAllocationChangedCallback(
+      const base::Callback<void(const GpuMemoryAllocationForRenderer&)>&
+          callback);
+
+  bool DiscardBackbuffer();
+  bool EnsureBackbuffer();
+
+  // Inserts a sync point, returning its ID. This is handled on the IO thread of
+  // the GPU process, and so should be relatively fast, but its effect is
+  // ordered wrt other messages (in particular, Flush). Sync point IDs are
+  // global and can be used for cross-channel synchronization.
+  uint32 InsertSyncPoint();
+
+  // Makes this command buffer wait on a sync point. This command buffer will be
+  // unscheduled until the command buffer that inserted that sync point reaches
+  // it, or gets destroyed.
+  void WaitSyncPoint(uint32);
+
+  // Makes this command buffer invoke a task when a sync point is reached, or
+  // the command buffer that inserted that sync point is destroyed.
+  bool SignalSyncPoint(uint32 sync_point,
+                       const base::Closure& callback);
+
+  // Set a task that will be invoked the next time the window becomes invalid
+  // and needs to be repainted. Takes ownership of task.
+  void SetNotifyRepaintTask(const base::Closure& callback);
+
+  // Sends an IPC message with the new state of surface visibility.
+  bool SetSurfaceVisible(bool visible);
+
+  void SetOnConsoleMessageCallback(
+      const GpuConsoleMessageCallback& callback);
+
   // TODO(apatrick): this is a temporary optimization while skia is calling
   // ContentGLContext::MakeCurrent prior to every GL call. It saves returning 6
   // ints redundantly when only the error is needed for the
   // CommandBufferProxyImpl implementation.
   virtual gpu::error::Error GetLastError() OVERRIDE;
 
   GpuChannelHost* channel() const { return channel_; }
 
  private:
   typedef std::map<int32, gpu::Buffer> TransferBufferMap;
@@ skipping 57 matching lines @@
   int32 state_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferProxyImpl);
 };
 
 }  // namespace content
 
 #endif  // ENABLE_GPU
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_