Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(772)

Unified Diff: ppapi/proxy/ppapi_command_buffer_proxy.h

Issue 9904005: PpapiCommandBufferProxy implements CommandBufferProxy. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge with ToT. Fixed compile. Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..a90263155b83cca7e148edbd209f2609e7b2a047 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,33 @@ 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 scoped_refptr<GpuVideoDecodeAcceleratorHost> CreateVideoDecoder(
+ media::VideoCodecProfile profile,
+ media::VideoDecodeAccelerator::Client* client) OVERRIDE;
+ virtual void SetOnConsoleMessageCallback(
+ const GpuConsoleMessageCallback& callback) OVERRIDE;
+
// gpu::CommandBuffer implementation:
virtual bool Initialize();
virtual State GetState();

Powered by Google App Engine
This is Rietveld 408576698