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/surfaces/surfaces_type_converters.h"
 #include "components/mus/public/cpp/surfaces/surfaces_utils.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_surface.h"
-#include "services/shell/public/cpp/connector.h"
 
 namespace bitmap_uploader {
 namespace {
 
 const uint32_t g_transparent_color = 0x00000000;
 
 }  // namespace
 
 const char kBitmapUploaderForAcceleratedWidget[] =
     "__BITMAP_UPLOADER_ACCELERATED_WIDGET__";
 
 BitmapUploader::BitmapUploader(mus::Window* window)
     : window_(window),
       color_(g_transparent_color),
       width_(0),
       height_(0),
       format_(BGRA),
       next_resource_id_(1u),
       id_namespace_(0u) {}
 
 BitmapUploader::~BitmapUploader() {
 }
 
 void BitmapUploader::Init(shell::Connector* connector) {

[sky, 2016/06/01 15:45:29]

Isn't this in services, which you also removed the dep from?

[Peng, 2016/06/01 16:23:21]

Yes. But this file just passes it as incomplete pointer to GLES2Context (never
really use it). So probably it is OK to remove it from dep, right?

   surface_ = window_->RequestSurface(mus::mojom::SurfaceType::DEFAULT);
   surface_->BindToThread();
   surface_->set_client(this);
 
-  connector->ConnectToInterface("mojo:mus", &gpu_service_);
-  mus::mojom::CommandBufferPtr command_buffer_ptr;
-  gpu_service_->CreateOffscreenGLES2Context(GetProxy(&command_buffer_ptr));
-  gles2_context_.reset(new mus::GLES2Context(std::vector<int32_t>(),
-                                             std::move(command_buffer_ptr)));
-  DCHECK(gles2_context_->Initialize());
+  gles2_context_ = mus::GLES2Context::CreateOffscreenContext(
+      std::vector<int32_t>(), connector);
+  DCHECK(gles2_context_);
 }
 
 // Sets the color which is RGBA.
 void BitmapUploader::SetColor(uint32_t color) {
   if (color_ == color)
     return;
   color_ = color;
   if (surface_)
     Upload();
 }
 
 // Sets a bitmap.
 void BitmapUploader::SetBitmap(int width,
                                int height,
                                std::unique_ptr<std::vector<unsigned char>> data,
                                Format format) {
   width_ = width;
   height_ = height;
   bitmap_ = std::move(data);
   format_ = format;
   if (surface_)
     Upload();
 }
 
 void BitmapUploader::Upload() {
-  // If the |gpu_service_| has errored than we won't get far. Do nothing,
-  // assuming we are in shutdown.
-  if (gpu_service_.encountered_error())
-    return;
-
   const gfx::Rect bounds(window_->bounds());
   mus::mojom::PassPtr pass = mojo::CreateDefaultPass(1, bounds);
   mus::mojom::CompositorFramePtr frame = mus::mojom::CompositorFrame::New();
 
   // TODO(rjkroege): Support device scale factor in PDF viewer
   mus::mojom::CompositorFrameMetadataPtr meta =
       mus::mojom::CompositorFrameMetadata::New();
   meta->device_scale_factor = 1.0f;
   frame->metadata = std::move(meta);
 
@@ skipping 126 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