diff options
author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-28 13:05:26 +0000 |
---|---|---|
committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-28 13:05:26 +0000 |
commit | bc390f12b3be83a0698fae361e7c47dbf4270661 (patch) | |
tree | 84ebd168ffc18ccc587397fd7ca07284b3fd7a1c /gpu | |
parent | cf54fa5cba06f2d2468ee20cb019b0bfb2f7722b (diff) | |
download | chromium_src-bc390f12b3be83a0698fae361e7c47dbf4270661.zip chromium_src-bc390f12b3be83a0698fae361e7c47dbf4270661.tar.gz chromium_src-bc390f12b3be83a0698fae361e7c47dbf4270661.tar.bz2 |
Fix layering violation where content is included by gpu.
Make WebGraphicsContext3DCommandBufferImpl aways use CommandBufferProxyImpl
instead of the more abstract CommandBufferProxy. Then remove methods used
only by WebGraphicsContext3DCommandBufferImpl from CommandBufferProxy.
BUG=157175
Review URL: https://chromiumcodereview.appspot.com/11267035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r-- | gpu/ipc/command_buffer_proxy.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/gpu/ipc/command_buffer_proxy.h b/gpu/ipc/command_buffer_proxy.h index 3ce13de..a992369 100644 --- a/gpu/ipc/command_buffer_proxy.h +++ b/gpu/ipc/command_buffer_proxy.h @@ -11,11 +11,6 @@ #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/common/command_buffer_shared.h" -// TODO(fsamuel): this is a layering violation. http://crbug.com/157175 -namespace content { -struct GpuMemoryAllocationForRenderer; -} - // Client side proxy that forwards messages synchronously to a // CommandBufferStub. class GPU_EXPORT CommandBufferProxy : public gpu::CommandBuffer { @@ -33,33 +28,6 @@ class GPU_EXPORT CommandBufferProxy : public gpu::CommandBuffer { // the task whether the echo succeeds or not. virtual bool Echo(const base::Closure& callback) = 0; - // Sends an IPC message with the new state of surface visibility. - virtual bool SetSurfaceVisible(bool visible) = 0; - - virtual bool DiscardBackbuffer() = 0; - virtual bool EnsureBackbuffer() = 0; - - // 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. - virtual uint32 InsertSyncPoint() = 0; - - // 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. - virtual void WaitSyncPoint(uint32) = 0; - - // Makes this command buffer invoke a task when a sync point is reached, or - // the command buffer that inserted that sync point is destroyed. - virtual bool SignalSyncPoint(uint32 sync_point, - const base::Closure& callback) = 0; - - // Register a callback to invoke whenever we recieve a new memory allocation. - virtual void SetMemoryAllocationChangedCallback( - const base::Callback<void( - const content::GpuMemoryAllocationForRenderer&)>& callback) = 0; - // 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 @@ -69,13 +37,6 @@ class GPU_EXPORT CommandBufferProxy : public gpu::CommandBuffer { virtual void SetChannelErrorCallback(const base::Closure& callback) = 0; - // Set a task that will be invoked the next time the window becomes invalid - // and needs to be repainted. Takes ownership of task. - virtual void SetNotifyRepaintTask(const base::Closure& callback) = 0; - - virtual void SetOnConsoleMessageCallback( - const GpuConsoleMessageCallback& callback) = 0; - private: DISALLOW_COPY_AND_ASSIGN(CommandBufferProxy); }; |