| Index: ppapi/proxy/ppapi_command_buffer_proxy.h
|
| diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.h b/ppapi/proxy/ppapi_command_buffer_proxy.h
|
| index 41b7ba9131a2029b3023c7465d62ef3b75792d3c..389ca35058126fbe3088b77230a68aec8bcc0899 100644
|
| --- a/ppapi/proxy/ppapi_command_buffer_proxy.h
|
| +++ b/ppapi/proxy/ppapi_command_buffer_proxy.h
|
| @@ -11,6 +11,7 @@
|
| #include "gpu/command_buffer/common/command_buffer.h"
|
| #include "ppapi/proxy/ppapi_proxy_export.h"
|
| #include "ppapi/shared_impl/host_resource.h"
|
| +#include "gpu/ipc/command_buffer_proxy.h"
|
|
|
| namespace IPC {
|
| class Message;
|
| @@ -21,15 +22,30 @@ namespace proxy {
|
|
|
| class ProxyChannel;
|
|
|
| -class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public gpu::CommandBuffer {
|
| +class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public CommandBufferProxy {
|
| public:
|
| PpapiCommandBufferProxy(const HostResource& resource,
|
| ProxyChannel* channel);
|
| virtual ~PpapiCommandBufferProxy();
|
|
|
| - void SetChannelErrorCallback(const base::Closure& callback);
|
| void ReportChannelError();
|
|
|
| + // 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 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;
|
| +
|
| // gpu::CommandBuffer implementation:
|
| virtual bool Initialize();
|
| virtual State GetState();
|
|
|