Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 6ca91bed3a272b90adb6bde4aa7d0e2ec2715f07..2b62a218eab1eb1d5092ef9333c844bc4a671260 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1940,7 +1940,8 @@ RenderThreadImpl::CreateCompositorFrameSink(
         RenderWidgetMusConnection::GetOrCreate(routing_id);
     scoped_refptr<gpu::GpuChannelHost> gpu_channel_host =
         EstablishGpuChannelSync();
-    return connection->CreateCompositorFrameSink(std::move(gpu_channel_host));
+    return connection->CreateCompositorFrameSink(std::move(gpu_channel_host),
+                                                 GetGpuMemoryBufferManager());
   }
 #endif
 
@@ -1978,8 +1979,8 @@ RenderThreadImpl::CreateCompositorFrameSink(
     DCHECK(!layout_test_mode());
     return base::MakeUnique<RendererCompositorFrameSink>(
         routing_id, compositor_frame_sink_id,
-        CreateExternalBeginFrameSource(routing_id), nullptr, nullptr,
-        std::move(frame_swap_message_queue));
+        CreateExternalBeginFrameSource(routing_id), nullptr, nullptr, nullptr,
+        shared_bitmap_manager(), std::move(frame_swap_message_queue));
   }
 
   scoped_refptr<ContextProviderCommandBuffer> worker_context_provider =
@@ -2024,15 +2025,16 @@ RenderThreadImpl::CreateCompositorFrameSink(
   if (layout_test_deps_) {
     return layout_test_deps_->CreateCompositorFrameSink(
         routing_id, std::move(gpu_channel_host), std::move(context_provider),
-        std::move(worker_context_provider), this);
+        std::move(worker_context_provider), GetGpuMemoryBufferManager(),
+        shared_bitmap_manager(), this);

[danakj, 2016/10/27 21:00:34]

why not null shared bitmap manager for this and below?

[piman, 2016/10/28 00:58:36]

Fair enough, changed (or removed parameter altogether as appropriate). I
originally just meant to keep the same things flowing through, but you're right
that this leads to further simplifications, so it's better.

   }
 
 #if defined(OS_ANDROID)
   if (sync_compositor_message_filter_) {
     return base::MakeUnique<SynchronousCompositorFrameSink>(
         std::move(context_provider), std::move(worker_context_provider),
-        routing_id, compositor_frame_sink_id,
-        CreateExternalBeginFrameSource(routing_id),
+        GetGpuMemoryBufferManager(), shared_bitmap_manager(), routing_id,
+        compositor_frame_sink_id, CreateExternalBeginFrameSource(routing_id),
         sync_compositor_message_filter_.get(),
         std::move(frame_swap_message_queue));
   }
@@ -2040,7 +2042,8 @@ RenderThreadImpl::CreateCompositorFrameSink(
   return base::WrapUnique(new RendererCompositorFrameSink(
       routing_id, compositor_frame_sink_id,
       CreateExternalBeginFrameSource(routing_id), std::move(context_provider),
-      std::move(worker_context_provider), std::move(frame_swap_message_queue)));
+      std::move(worker_context_provider), GetGpuMemoryBufferManager(),
+      shared_bitmap_manager(), std::move(frame_swap_message_queue)));
 }
 
 AssociatedInterfaceRegistry*