Plumb GpuSwapBuffers completion from Mus GPU thread to WS thread

components/mus/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 "components/mus/gles2/command_buffer_impl.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "components/mus/gles2/command_buffer_driver.h"
@@ skipping 14 matching lines @@
 }
 
 void RunMakeProgressCallback(
     const mojom::CommandBuffer::MakeProgressCallback& callback,
     const gpu::CommandBuffer::State& state) {
   callback.Run(state);
 }
 
 }  // namespace
 
-class CommandBufferImpl::CommandBufferDriverClientImpl
-    : public CommandBufferDriver::Client {
- public:
-  explicit CommandBufferDriverClientImpl(CommandBufferImpl* command_buffer)
-      : command_buffer_(command_buffer) {}
-
- private:
-  void DidLoseContext(uint32_t reason) override {
-    command_buffer_->DidLoseContext(reason);
-  }
-  void UpdateVSyncParameters(int64_t timebase, int64_t interval) override {}
-
-  CommandBufferImpl* command_buffer_;
-
-  DISALLOW_COPY_AND_ASSIGN(CommandBufferDriverClientImpl);
-};
-
 CommandBufferImpl::CommandBufferImpl(
     mojo::InterfaceRequest<mus::mojom::CommandBuffer> request,
     scoped_refptr<GpuState> gpu_state)
     : gpu_state_(gpu_state) {
   // Bind |CommandBufferImpl| to the |request| in the GPU control thread.
   gpu_state_->control_task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&CommandBufferImpl::BindToRequest,
                  base::Unretained(this), base::Passed(&request)));
 }
 
 void CommandBufferImpl::DidLoseContext(uint32_t reason) {
   driver_->set_client(nullptr);
   client_->Destroyed(reason, gpu::error::kLostContext);
 }
 
+void CommandBufferImpl::UpdateVSyncParameters(int64_t timebase,
+                                              int64_t interval) {}
+
+void CommandBufferImpl::OnGpuCompletedSwapBuffers(gfx::SwapResult result) {}
+
 CommandBufferImpl::~CommandBufferImpl() {
 }
 
 void CommandBufferImpl::Initialize(
     mus::mojom::CommandBufferClientPtr client,
     mojo::ScopedSharedBufferHandle shared_state,
     mojo::Array<int32_t> attribs,
     const mojom::CommandBuffer::InitializeCallback& callback) {
   gpu_state_->command_buffer_task_runner()->task_runner()->PostTask(
       FROM_HERE,
@@ skipping 107 matching lines @@
     mojom::CommandBufferClientPtr client,
     mojo::ScopedSharedBufferHandle shared_state,
     mojo::Array<int32_t> attribs,
     const base::Callback<
         void(mojom::CommandBufferInitializeResultPtr)>& callback) {
   DCHECK(!driver_);
   driver_.reset(new CommandBufferDriver(
       gpu::CommandBufferNamespace::MOJO,
       gpu::CommandBufferId::FromUnsafeValue(++g_next_command_buffer_id),
       gfx::kNullAcceleratedWidget, gpu_state_));
-  driver_->set_client(make_scoped_ptr(new CommandBufferDriverClientImpl(this)));
+  driver_->set_client(this);
   client_ = mojo::MakeProxy(client.PassInterface());
   bool result =
       driver_->Initialize(std::move(shared_state), std::move(attribs));
   mojom::CommandBufferInitializeResultPtr initialize_result;
   if (result) {
     initialize_result = mojom::CommandBufferInitializeResult::New();
     initialize_result->command_buffer_namespace = driver_->GetNamespaceID();
     initialize_result->command_buffer_id =
         driver_->GetCommandBufferID().GetUnsafeValue();
     initialize_result->capabilities = driver_->GetCapabilities();
@@ skipping 90 matching lines @@
 bool CommandBufferImpl::DeleteOnGpuThread() {
   delete this;
   return true;
 }
 
 void CommandBufferImpl::DeleteOnGpuThread2() {
   delete this;
 }
 
 }  // namespace mus