De-Client CommandBuffer interface

services/gles2/command_buffer_driver.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_
 #define SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 19 matching lines @@
 class GLShareGroup;
 class GLSurface;
 }
 
 namespace gles2 {
 
 class CommandBufferDriver {
  public:
   class Client {
    public:
-    virtual void DidDestroy() = 0;
+    virtual ~Client();
     virtual void UpdateVSyncParameters(base::TimeTicks timebase,
                                        base::TimeDelta interval) = 0;
-    virtual void LostContext(int32_t lost_reason) = 0;
-
-   protected:
-    virtual ~Client();
+    virtual void DidLoseContext() = 0;
   };
   // Offscreen.
   CommandBufferDriver(gfx::GLShareGroup* share_group,
                       gpu::gles2::MailboxManager* mailbox_manager,
                       gpu::SyncPointManager* sync_point_manager);
   // Onscreen.
   CommandBufferDriver(gfx::AcceleratedWidget widget,
                       const gfx::Size& size,
                       gfx::GLShareGroup* share_group,
                       gpu::gles2::MailboxManager* mailbox_manager,
                       gpu::SyncPointManager* sync_point_manager);
   ~CommandBufferDriver();
 
-  void set_client(Client* client) { client_ = client; }
+  void set_client(scoped_ptr<Client> client) { client_ = client.Pass(); }
 
   void Initialize(mojo::CommandBufferSyncClientPtr sync_client,
+                  mojo::CommandBufferLostContextObserverPtr loss_observer,
                   mojo::ScopedSharedBufferHandle shared_state);
   void SetGetBuffer(int32_t buffer);
   void Flush(int32_t put_offset);
   void MakeProgress(int32_t last_get_offset);
   void RegisterTransferBuffer(int32_t id,
                               mojo::ScopedSharedBufferHandle transfer_buffer,
                               uint32_t size);
   void DestroyTransferBuffer(int32_t id);
   void Echo(const mojo::Callback<void()>& callback);
 
  private:
   bool DoInitialize(mojo::ScopedSharedBufferHandle shared_state);
   void OnResize(gfx::Size size, float scale_factor);
   bool OnWaitSyncPoint(uint32_t sync_point);
   void OnSyncPointRetired();
   void OnParseError();
   void OnContextLost(uint32_t reason);
   void OnUpdateVSyncParameters(const base::TimeTicks timebase,
                                const base::TimeDelta interval);
 
-  Client* client_;
+  scoped_ptr<Client> client_;
   mojo::CommandBufferSyncClientPtr sync_client_;
+  mojo::CommandBufferLostContextObserverPtr loss_observer_;
   gfx::AcceleratedWidget widget_;
   gfx::Size size_;
   scoped_ptr<gpu::CommandBufferService> command_buffer_;
   scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
   scoped_ptr<gpu::GpuScheduler> scheduler_;
   scoped_refptr<gfx::GLContext> context_;
   scoped_refptr<gfx::GLSurface> surface_;
   scoped_refptr<gfx::GLShareGroup> share_group_;
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
   scoped_refptr<gpu::SyncPointManager> sync_point_manager_;
 
   scoped_refptr<base::SingleThreadTaskRunner> context_lost_task_runner_;
   base::Callback<void(int32_t)> context_lost_callback_;
 
   base::WeakPtrFactory<CommandBufferDriver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferDriver);
 };
 
 }  // namespace gles2
 
 #endif  // SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_