De-Client CommandBuffer interface

services/gles2/command_buffer_impl.cc

 // Copyright 2014 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.
 
 #include "services/gles2/command_buffer_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "services/gles2/command_buffer_driver.h"
@@ skipping 10 matching lines @@
 
 class CommandBufferDriverClientImpl : public CommandBufferDriver::Client {
  public:
   CommandBufferDriverClientImpl(
       base::WeakPtr<CommandBufferImpl> command_buffer,
       scoped_refptr<base::SingleThreadTaskRunner> control_task_runner)
       : command_buffer_(command_buffer),
         control_task_runner_(control_task_runner) {}
 
  private:
-  void DidDestroy() override { delete this; }
-
   void UpdateVSyncParameters(base::TimeTicks timebase,
                              base::TimeDelta interval) override {
     control_task_runner_->PostTask(
         FROM_HERE, base::Bind(&CommandBufferImpl::UpdateVSyncParameters,
                               command_buffer_, timebase, interval));
   }
 
-  void LostContext(int32_t lost_reason) override {
+  void DidLoseContext() override {
     control_task_runner_->PostTask(
-        FROM_HERE, base::Bind(&CommandBufferImpl::LostContext, command_buffer_,
-                              lost_reason));
+        FROM_HERE, base::Bind(&CommandBufferImpl::DidLoseContext,
+           command_buffer_));
   }
 
   base::WeakPtr<CommandBufferImpl> command_buffer_;
   scoped_refptr<base::SingleThreadTaskRunner> control_task_runner_;
 };
 }
 
 CommandBufferImpl::CommandBufferImpl(
     mojo::InterfaceRequest<mojo::CommandBuffer> request,
     mojo::ViewportParameterListenerPtr listener,
     scoped_refptr<base::SingleThreadTaskRunner> control_task_runner,
     gpu::SyncPointManager* sync_point_manager,
     scoped_ptr<CommandBufferDriver> driver)
     : sync_point_manager_(sync_point_manager),
       driver_task_runner_(base::MessageLoop::current()->task_runner()),
       driver_(driver.Pass()),
       viewport_parameter_listener_(listener.Pass()),
       binding_(this),
       weak_factory_(this) {
-  driver_->set_client(new CommandBufferDriverClientImpl(
-      weak_factory_.GetWeakPtr(), control_task_runner));
+  driver_->set_client(make_scoped_ptr(new CommandBufferDriverClientImpl(
+      weak_factory_.GetWeakPtr(), control_task_runner)));
 
   control_task_runner->PostTask(
       FROM_HERE, base::Bind(&CommandBufferImpl::BindToRequest,
                             base::Unretained(this), base::Passed(&request)));
 }
 
 CommandBufferImpl::~CommandBufferImpl() {
-  binding_.client()->DidDestroy();
   driver_task_runner_->PostTask(
       FROM_HERE, base::Bind(&DestroyDriver, base::Passed(&driver_)));
 }
 
 void CommandBufferImpl::Initialize(
     mojo::CommandBufferSyncClientPtr sync_client,
     mojo::CommandBufferSyncPointClientPtr sync_point_client,
+    mojo::CommandBufferLostContextObserverPtr loss_observer,
     mojo::ScopedSharedBufferHandle shared_state) {
   sync_point_client_ = sync_point_client.Pass();
   driver_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&CommandBufferDriver::Initialize,
                  base::Unretained(driver_.get()), base::Passed(&sync_client),
+                 base::Passed(&loss_observer),
                  base::Passed(&shared_state)));
 }
 
 void CommandBufferImpl::SetGetBuffer(int32_t buffer) {
   driver_task_runner_->PostTask(
       FROM_HERE, base::Bind(&CommandBufferDriver::SetGetBuffer,
                             base::Unretained(driver_.get()), buffer));
 }
 
 void CommandBufferImpl::Flush(int32_t put_offset) {
@@ skipping 43 matching lines @@
 void CommandBufferImpl::Echo(const mojo::Callback<void()>& callback) {
   driver_task_runner_->PostTaskAndReply(FROM_HERE, base::Bind(&base::DoNothing),
                                         base::Bind(&RunCallback, callback));
 }
 
 void CommandBufferImpl::BindToRequest(
     mojo::InterfaceRequest<mojo::CommandBuffer> request) {
   binding_.Bind(request.Pass());
 }
 
-void CommandBufferImpl::LostContext(int32_t reason) {
-  binding_.client()->LostContext(reason);
+void CommandBufferImpl::DidLoseContext() {
+  binding_.OnConnectionError();
 }
 
 void CommandBufferImpl::UpdateVSyncParameters(base::TimeTicks timebase,
                                               base::TimeDelta interval) {
   if (!viewport_parameter_listener_)
     return;
   viewport_parameter_listener_->OnVSyncParametersUpdated(
       timebase.ToInternalValue(), interval.ToInternalValue());
 }
 
 }  // namespace gles2