Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

services/ui/demo/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 "services/ui/demo/bitmap_uploader.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 22 matching lines @@
     : window_(window),
       color_(g_transparent_color),
       width_(0),
       height_(0),
       format_(BGRA),
       next_resource_id_(1u),
       weak_factory_(this) {}
 
 void BitmapUploader::Init(ui::GpuService* gpu_service) {
   gpu_service->EstablishGpuChannel(base::Bind(
-      &BitmapUploader::OnGpuChannelEstablished, weak_factory_.GetWeakPtr()));
+      &BitmapUploader::OnGpuChannelEstablished, weak_factory_.GetWeakPtr(),
+      gpu_service->gpu_memory_buffer_manager()));
 }
 
 BitmapUploader::~BitmapUploader() {
   compositor_frame_sink_->DetachFromClient();
 }
 
 // Sets the color which is RGBA.
 void BitmapUploader::SetColor(uint32_t color) {
   if (color_ == color)
     return;
@@ skipping 112 matching lines @@
                  force_antialiasing_off);
   }
 
   frame.delegated_frame_data->render_pass_list.push_back(std::move(pass));
 
   // TODO(rjkroege, fsamuel): We should throttle frames.
   compositor_frame_sink_->SubmitCompositorFrame(std::move(frame));
 }
 
 void BitmapUploader::OnGpuChannelEstablished(
+    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     scoped_refptr<gpu::GpuChannelHost> gpu_channel) {
   compositor_frame_sink_ = window_->RequestCompositorFrameSink(
       mojom::CompositorFrameSinkType::DEFAULT,
-      new ContextProvider(std::move(gpu_channel)));
+      new ContextProvider(std::move(gpu_channel)), gpu_memory_buffer_manager);
   compositor_frame_sink_->BindToClient(this);
 }
 
 uint32_t BitmapUploader::BindTextureForSize(const gfx::Size& size) {
   gpu::gles2::GLES2Interface* gl =
       compositor_frame_sink_->context_provider()->ContextGL();
   // TODO(jamesr): Recycle textures.
   GLuint texture = 0u;
   gl->GenTextures(1, &texture);
   gl->BindTexture(GL_TEXTURE_2D, texture);
@@ skipping 43 matching lines @@
   // TODO(fsamuel): Implement this.
 }
 
 void BitmapUploader::SetExternalTilePriorityConstraints(
     const gfx::Rect& viewport_rect,
     const gfx::Transform& transform) {
   // TODO(fsamuel): Implement this.
 }
 
 }  // namespace ui