Impl mus::mojom::GpuService to enable using Chrome IPC version gpu CmdBuf in mus

components/bitmap_uploader/bitmap_uploader.cc

 // Copyright 2015 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/bitmap_uploader/bitmap_uploader.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "components/mus/public/cpp/gles2_context.h"
+#include "components/mus/public/cpp/gpu_service.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_surface.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_utils.h"
 #include "services/shell/public/cpp/connector.h"
 
 namespace bitmap_uploader {
 namespace {
 
@@ skipping 14 matching lines @@
       id_namespace_(0u) {}
 
 BitmapUploader::~BitmapUploader() {
 }
 
 void BitmapUploader::Init(shell::Connector* connector) {
   surface_ = window_->RequestSurface(mus::mojom::SurfaceType::DEFAULT);
   surface_->BindToThread();
   surface_->set_client(this);
 
-  connector->ConnectToInterface("mojo:mus", &gpu_service_);
-  mus::mojom::CommandBufferPtr gles2_client;
-  gpu_service_->CreateOffscreenGLES2Context(GetProxy(&gles2_client));
-  gles2_context_.reset(new mus::GLES2Context(
-      std::vector<int32_t>(), gles2_client.PassInterface().PassHandle()));
+  mojo::ScopedMessagePipeHandle scoped_handle;
+  if (!mus::GpuService::UseChromeGpuCommandBuffer()) {
+    connector->ConnectToInterface("mojo:mus", &gpu_service_);
+    mus::mojom::CommandBufferPtr gles2_client;
+    gpu_service_->CreateOffscreenGLES2Context(GetProxy(&gles2_client));
+    scoped_handle = gles2_client.PassInterface().PassHandle();
+  } else {
+    mus::GpuService::Initialize(connector);
+  }
+
+  gles2_context_.reset(
+      new mus::GLES2Context(std::vector<int32_t>(), std::move(scoped_handle)));
   DCHECK(gles2_context_->Initialize());
 }
 
 // Sets the color which is RGBA.
 void BitmapUploader::SetColor(uint32_t color) {
   if (color_ == color)
     return;
   color_ = color;
   if (surface_)
     Upload();
@@ skipping 28 matching lines @@
   meta->device_scale_factor = 1.0f;
   frame->metadata = std::move(meta);
 
   frame->resources.resize(0u);
 
   pass->quads.resize(0u);
   pass->shared_quad_states.push_back(
       mojo::CreateDefaultSQS(bounds.size()));
 
   if (bitmap_.get()) {
-    gpu::gles2::GLES2Interface* gl = gles2_context_->interface();
     mojo::Size bitmap_size;
     bitmap_size.width = width_;
     bitmap_size.height = height_;
+    gpu::gles2::GLES2Interface* gl = gles2_context_->interface();
     GLuint texture_id = BindTextureForSize(bitmap_size);
     gl->TexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, bitmap_size.width,
                       bitmap_size.height, TextureFormat(), GL_UNSIGNED_BYTE,
                       &((*bitmap_)[0]));
 
     gpu::Mailbox mailbox;
     gl->GenMailboxCHROMIUM(mailbox.name);
     gl->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
 
     const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM();
@@ skipping 113 matching lines @@
     DCHECK_EQ(1, resource->count);
     gl->WaitSyncTokenCHROMIUM(resource->sync_token.GetConstData());
     uint32_t texture_id = resource_to_texture_id_map_[resource->id];
     DCHECK_NE(0u, texture_id);
     resource_to_texture_id_map_.erase(resource->id);
     gl->DeleteTextures(1, &texture_id);
   }
 }
 
 }  // namespace bitmap_uploader