| Index: content/common/gpu/client/command_buffer_proxy_impl.h
|
| diff --git a/content/common/gpu/client/command_buffer_proxy_impl.h b/content/common/gpu/client/command_buffer_proxy_impl.h
|
| index cd1232ab11b01fe8f81e32a48cde1ef82cb8c283..10e7d3ee11091b39abb4150724670a87e2584491 100644
|
| --- a/content/common/gpu/client/command_buffer_proxy_impl.h
|
| +++ b/content/common/gpu/client/command_buffer_proxy_impl.h
|
| @@ -18,9 +18,9 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "content/common/gpu/gpu_memory_allocation.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 "gpu/command_buffer/common/gpu_control.h"
|
| #include "ipc/ipc_listener.h"
|
| #include "media/video/video_decode_accelerator.h"
|
| #include "ui/base/latency_info.h"
|
| @@ -42,6 +42,7 @@ class GpuChannelHost;
|
| // CommandBufferStub.
|
| class CommandBufferProxyImpl
|
| : public CommandBufferProxy,
|
| + public gpu::GpuControl,
|
| public IPC::Listener,
|
| public base::SupportsWeakPtr<CommandBufferProxyImpl> {
|
| public:
|
| @@ -99,6 +100,14 @@ class CommandBufferProxyImpl
|
| gpu::error::ContextLostReason reason) OVERRIDE;
|
| virtual uint32 InsertSyncPoint() OVERRIDE;
|
|
|
| + // GpuControl implementation:
|
| + virtual gfx::GpuMemoryBuffer* CreateGpuMemoryBuffer(
|
| + size_t width,
|
| + size_t height,
|
| + unsigned internalformat,
|
| + int32* id) OVERRIDE;
|
| + virtual void DestroyGpuMemoryBuffer(int32 id) OVERRIDE;
|
| +
|
| void SetMemoryAllocationChangedCallback(
|
| const base::Callback<void(const GpuMemoryAllocationForRenderer&)>&
|
| callback);
|
|
|