Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

content/renderer/android/synchronous_compositor_frame_sink.cc

Index: content/renderer/android/synchronous_compositor_frame_sink.cc
diff --git a/content/renderer/android/synchronous_compositor_frame_sink.cc b/content/renderer/android/synchronous_compositor_frame_sink.cc
index 32b07eb2bc472d8cc1e749c65781fc5213847b69..156d62960ee917e6f77b5a130ede3687777daedc 100644
--- a/content/renderer/android/synchronous_compositor_frame_sink.cc
+++ b/content/renderer/android/synchronous_compositor_frame_sink.cc
@@ -104,13 +104,16 @@ class SynchronousCompositorFrameSink::SoftwareOutputSurface
 SynchronousCompositorFrameSink::SynchronousCompositorFrameSink(
     scoped_refptr<cc::ContextProvider> context_provider,
     scoped_refptr<cc::ContextProvider> worker_context_provider,
+    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     int routing_id,
     uint32_t compositor_frame_sink_id,
     std::unique_ptr<cc::BeginFrameSource> begin_frame_source,
     SynchronousCompositorRegistry* registry,
     scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue)
     : cc::CompositorFrameSink(std::move(context_provider),
-                              std::move(worker_context_provider)),
+                              std::move(worker_context_provider),
+                              gpu_memory_buffer_manager,
+                              nullptr),
       routing_id_(routing_id),
       compositor_frame_sink_id_(compositor_frame_sink_id),
       registry_(registry),
@@ -174,15 +177,11 @@ bool SynchronousCompositorFrameSink::BindToClient(
       base::MakeUnique<SoftwareDevice>(&current_sw_canvas_));
   software_output_surface_ = output_surface.get();
 
-  // The shared_bitmap_manager and gpu_memory_buffer_manager here are null as
-  // this Display is only used for resourcesless software draws, where no
-  // resources are included in the frame swapped from the compositor. So there
-  // is no need for these.
   display_.reset(new cc::Display(
-      nullptr /* shared_bitmap_manager */,
-      nullptr /* gpu_memory_buffer_manager */, software_renderer_settings,
-      nullptr /* begin_frame_source */, std::move(output_surface),
-      nullptr /* scheduler */, nullptr /* texture_mailbox_deleter */));
+      nullptr /* shared_bitmap_manager */, gpu_memory_buffer_manager(),

[danakj, 2016/10/28 01:33:20]

In this one they were both null before because its for resourceless software
draw. If anything it'd need SBM but actually neither is needed. (There was a bit
comment about this, maybe it'd make sense to leave this both null and put that
back.)

[piman, 2016/10/28 22:08:33]

Done.

+      software_renderer_settings, nullptr /* begin_frame_source */,
+      std::move(output_surface), nullptr /* scheduler */,
+      nullptr /* texture_mailbox_deleter */));
   display_->Initialize(&display_client_, surface_manager_.get(), kFrameSinkId);
   display_->SetVisible(true);
   return true;