Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

blimp/client/core/compositor/blimp_compositor.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 "blimp/client/core/compositor/blimp_compositor.h"
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 171 matching lines @@
   // Try again if the context creation failed.
   if (!compositor_context_provider) {
     GetEmbedderDeps()->GetContextProviders(
         base::Bind(&BlimpCompositor::OnContextProvidersCreated,
                    weak_ptr_factory_.GetWeakPtr()));
     return;
   }
 
   auto compositor_frame_sink = base::MakeUnique<BlimpCompositorFrameSink>(
       std::move(compositor_context_provider),
-      std::move(worker_context_provider), base::ThreadTaskRunnerHandle::Get(),
-      weak_ptr_factory_.GetWeakPtr());
+      std::move(worker_context_provider),
+      GetEmbedderDeps()->GetGpuMemoryBufferManager(), nullptr,
+      base::ThreadTaskRunnerHandle::Get(), weak_ptr_factory_.GetWeakPtr());
 
   host_->SetCompositorFrameSink(std::move(compositor_frame_sink));
 }
 
 void BlimpCompositor::BindToProxyClient(
     base::WeakPtr<BlimpCompositorFrameSinkProxyClient> proxy_client) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!surface_factory_);
 
   proxy_client_ = proxy_client;
@@ skipping 82 matching lines @@
 }
 
 void BlimpCompositor::CreateLayerTreeHost() {
   DCHECK(!host_);
   VLOG(1) << "Creating LayerTreeHost.";
 
   // Create the LayerTreeHost
   cc::LayerTreeHostInProcess::InitParams params;
   params.client = this;
   params.task_graph_runner = compositor_dependencies_->GetTaskGraphRunner();
-  params.gpu_memory_buffer_manager =
-      GetEmbedderDeps()->GetGpuMemoryBufferManager();
   params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
   params.image_serialization_processor =
       compositor_dependencies_->GetImageSerializationProcessor();
 
   cc::LayerTreeSettings* settings =
       compositor_dependencies_->GetLayerTreeSettings();
   // TODO(khushalsagar): This is a hack. Remove when we move the split point
   // out. For details on why this is needed, see crbug.com/586210.
   settings->abort_commit_before_compositor_frame_sink_creation = false;
   params.settings = settings;
@@ skipping 34 matching lines @@
       it->second.Run();
       it = pending_commit_trackers_.erase(it);
     } else {
       ++it;
     }
   }
 }
 
 }  // namespace client
 }  // namespace blimp