commit c44437a22b4b75aa2b780ddb8f8adb562844d994
author piman <piman@chromium.org> Sat Oct 29 00:09:22 2016
committer Commit bot <commit-bot@chromium.org> Sat Oct 29 00:12:45 2016
tree d4925e0fda04c8b0ffeb97e4a93d6a2ebdbbfa1e
parent 614913eb9d85a921dc84ee66d72e128af2c23f3a

Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

They're only used by the ResourceProvider, so there's no fundamental reason for
them to take a separate path through the compositor. Besides, it is natural that
the CompositorFrameSink contains all the objects needed to create resources, all
at the same place. Finally, it's less code overall.

BUG=None
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel

Review-Url: https://codereview.chromium.org/2452483002
Cr-Commit-Position: refs/heads/master@{#428551}

content/renderer/render_thread_impl.cc

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 7296ab1..8ea4bb1 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1948,7 +1948,8 @@
         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
 
@@ -1986,8 +1987,8 @@
     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 =
@@ -2032,14 +2033,15 @@
   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(),
+        this);
   }
 
 #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,
+        GetGpuMemoryBufferManager(), routing_id, compositor_frame_sink_id,
         CreateExternalBeginFrameSource(routing_id),
         sync_compositor_message_filter_.get(),
         std::move(frame_swap_message_queue));
@@ -2048,7 +2050,8 @@
   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(),
+      nullptr, std::move(frame_swap_message_queue)));
 }
 
 AssociatedInterfaceRegistry*