Plumb GpuSwapBuffers completion from Mus GPU thread to WS thread

components/mus/gles2/command_buffer_driver.cc

 // 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.
 
 #include "components/mus/gles2/command_buffer_driver.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
+#include "components/mus/gles2/gl_surface_adapter.h"
 #include "components/mus/gles2/gpu_memory_tracker.h"
 #include "components/mus/gles2/gpu_state.h"
 #include "components/mus/gles2/mojo_buffer_backing.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/command_executor.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/image_factory.h"
 #include "gpu/command_buffer/service/image_manager.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
@@ skipping 50 matching lines @@
 
 bool CommandBufferDriver::Initialize(
     mojo::ScopedSharedBufferHandle shared_state,
     mojo::Array<int32_t> attribs) {
   DCHECK(CalledOnValidThread());
   gpu::gles2::ContextCreationAttribHelper attrib_helper;
   if (!attrib_helper.Parse(attribs.storage()))
     return false;
 
   const bool offscreen = widget_ == gfx::kNullAcceleratedWidget;
+  static scoped_refptr<gfx::GLSurface> underlying_surface;
   if (offscreen) {
     surface_ = gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1));
   } else {
-    surface_ = gfx::GLSurface::CreateViewGLSurface(widget_);
+    scoped_refptr<GLSurfaceAdapterMus> s =

[Fady Samuel, 2016/04/01 23:24:42]

nit: better variable name than s please?

[rjkroege, 2016/04/01 23:58:44]

Done. I may have been corrupted by viewing the plan9 source. :-)

+        new GLSurfaceAdapterMus(gfx::GLSurface::CreateViewGLSurface(widget_));
+    s->SetGpuCompletedSwapBuffersCallback(
+        base::Bind(&CommandBufferDriver::OnGpuCompletedSwapBuffers,
+                   weak_factory_.GetWeakPtr()));
+    surface_ = s;
+
     gfx::VSyncProvider* vsync_provider =
         surface_ ? surface_->GetVSyncProvider() : nullptr;
     if (vsync_provider) {
       vsync_provider->GetVSyncParameters(
           base::Bind(&CommandBufferDriver::OnUpdateVSyncParameters,
                      weak_factory_.GetWeakPtr()));
     }
   }
 
   if (!surface_.get())
@@ skipping 391 matching lines @@
   DCHECK(CalledOnValidThread());
 
   gpu::gles2::QueryManager* query_manager = decoder_->GetQueryManager();
   gpu::gles2::QueryManager::Query* query = query_manager->GetQuery(query_id);
   if (query)
     query->AddCallback(callback);
   else
     callback.Run();
 }
 
+void CommandBufferDriver::OnGpuCompletedSwapBuffers(gfx::SwapResult result) {
+  DCHECK(CalledOnValidThread());
+  if (client_) {
+    client_->OnGpuCompletedSwapBuffers(result);
+  }
+}
+
 }  // namespace mus