Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

blimp/client/support/compositor/blimp_embedder_compositor.cc

 // Copyright 2016 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 "blimp/client/support/compositor/blimp_embedder_compositor.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 99 matching lines @@
     CompositorDependencies* compositor_dependencies)
     : compositor_dependencies_(compositor_dependencies),
       frame_sink_id_(compositor_dependencies->AllocateFrameSinkId()),
       compositor_frame_sink_request_pending_(false),
       root_layer_(cc::Layer::Create()) {
   compositor_dependencies_->GetSurfaceManager()->RegisterFrameSinkId(
       frame_sink_id_);
 
   cc::LayerTreeHostInProcess::InitParams params;
   params.client = this;
-  params.gpu_memory_buffer_manager =
-      compositor_dependencies_->GetGpuMemoryBufferManager();
   params.task_graph_runner = g_task_graph_runner.Pointer();
   cc::LayerTreeSettings settings;
   params.settings = &settings;
   params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
   params.animation_host = cc::AnimationHost::CreateMainInstance();
   host_ = cc::LayerTreeHostInProcess::CreateSingleThreaded(this, &params);
 
   root_layer_->SetBackgroundColor(SK_ColorWHITE);
   host_->GetLayerTree()->SetRootLayer(root_layer_);
   host_->SetFrameSinkId(frame_sink_id_);
@@ skipping 64 matching lines @@
 
   // Can't handle the request right now since we don't have a widget.
   if (!host_->IsVisible())
     return;
 
   DCHECK(context_provider_);
   context_provider_->BindToCurrentThread();
 
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
       compositor_dependencies_->GetGpuMemoryBufferManager();
+  cc::SharedBitmapManager* shared_bitmap_manager = nullptr;
 
   auto task_runner = base::ThreadTaskRunnerHandle::Get();
   auto display_output_surface =
       base::MakeUnique<DisplayOutputSurface>(context_provider_, task_runner);
 
   std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source(
       new cc::DelayBasedBeginFrameSource(
           base::MakeUnique<cc::DelayBasedTimeSource>(task_runner.get())));
   std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
       begin_frame_source.get(), task_runner.get(),
       display_output_surface->capabilities().max_frames_pending));
 
   display_ = base::MakeUnique<cc::Display>(
-      nullptr /*shared_bitmap_manager*/, gpu_memory_buffer_manager,
+      shared_bitmap_manager, gpu_memory_buffer_manager,
       host_->GetSettings().renderer_settings, std::move(begin_frame_source),
       std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(task_runner.get()));
   display_->SetVisible(true);
   display_->Resize(viewport_size_in_px_);
 
   // The Browser compositor and display share the same context provider.
   auto compositor_frame_sink = base::MakeUnique<cc::DirectCompositorFrameSink>(
       frame_sink_id_, compositor_dependencies_->GetSurfaceManager(),
-      display_.get(), context_provider_, nullptr);
+      display_.get(), context_provider_, nullptr, gpu_memory_buffer_manager,
+      shared_bitmap_manager);
 
   host_->SetCompositorFrameSink(std::move(compositor_frame_sink));
 }
 
 }  // namespace client
 }  // namespace blimp