Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / mojo / gles2 / command_buffer_client_impl.h

diff --git a/src/mojo/gles2/command_buffer_client_impl.h b/src/mojo/gles2/command_buffer_client_impl.h
index 68312e0..e192169 100644 (file)
--- a/src/mojo/gles2/command_buffer_client_impl.h
+++ b/src/mojo/gles2/command_buffer_client_impl.h
@@ -20,9 +20,6 @@ class RunLoop;
 }
 
 namespace mojo {
-template <typename S>
-class SyncDispatcher;
-
 namespace gles2 {
 class CommandBufferClientImpl;
 
@@ -30,11 +27,9 @@ class CommandBufferDelegate {
  public:
   virtual ~CommandBufferDelegate();
   virtual void ContextLost();
-  virtual void DrawAnimationFrame();
 };
 
 class CommandBufferClientImpl : public CommandBufferClient,
-                                public CommandBufferSyncClient,
                                 public ErrorHandler,
                                 public gpu::CommandBuffer,
                                 public gpu::GpuControl {
@@ -66,6 +61,8 @@ class CommandBufferClientImpl : public CommandBufferClient,
                                                       int32* id) OVERRIDE;
   virtual void DestroyGpuMemoryBuffer(int32 id) OVERRIDE;
   virtual uint32 InsertSyncPoint() OVERRIDE;
+  virtual uint32 InsertFutureSyncPoint() OVERRIDE;
+  virtual void RetireSyncPoint(uint32 sync_point) OVERRIDE;
   virtual void SignalSyncPoint(uint32 sync_point,
                                const base::Closure& callback) OVERRIDE;
   virtual void SignalQuery(uint32 query,
@@ -74,21 +71,16 @@ class CommandBufferClientImpl : public CommandBufferClient,
   virtual void Echo(const base::Closure& callback) OVERRIDE;
   virtual uint32 CreateStreamTexture(uint32 texture_id) OVERRIDE;
 
-  void RequestAnimationFrames();
-  void CancelAnimationFrames();
-
  private:
+  class SyncClientImpl;
+
   // CommandBufferClient implementation:
-  virtual void DidInitialize(bool success) OVERRIDE;
-  virtual void DidMakeProgress(CommandBufferStatePtr state) OVERRIDE;
   virtual void DidDestroy() OVERRIDE;
   virtual void LostContext(int32_t lost_reason) OVERRIDE;
 
   // ErrorHandler implementation:
   virtual void OnConnectionError() OVERRIDE;
 
-  virtual void DrawAnimationFrame() OVERRIDE;
-
   void TryUpdateState();
   void MakeProgressAndUpdateState();
 
@@ -96,7 +88,7 @@ class CommandBufferClientImpl : public CommandBufferClient,
 
   CommandBufferDelegate* delegate_;
   CommandBufferPtr command_buffer_;
-  scoped_ptr<SyncDispatcher<CommandBufferSyncClient> > sync_dispatcher_;
+  scoped_ptr<SyncClientImpl> sync_client_impl_;
 
   State last_state_;
   mojo::ScopedSharedBufferHandle shared_state_handle_;
@@ -104,7 +96,6 @@ class CommandBufferClientImpl : public CommandBufferClient,
   int32 last_put_offset_;
   int32 next_transfer_buffer_id_;
 
-  bool initialize_result_;
   const MojoAsyncWaiter* async_waiter_;
 };