Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 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 "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 1922 matching lines @@
   if (command_line.HasSwitch(switches::kDisableGpuCompositing))
     use_software = true;
 
 #if defined(USE_AURA)
   if (GetServiceManagerConnection() && !use_software &&
       command_line.HasSwitch(switches::kUseMusInRenderer)) {
     RenderWidgetMusConnection* connection =
         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
 
   uint32_t compositor_frame_sink_id = g_next_compositor_frame_sink_id++;
 
   if (command_line.HasSwitch(switches::kEnableVulkan)) {
     scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider =
         cc::VulkanInProcessContextProvider::Create();
     if (vulkan_context_provider) {
       DCHECK(!layout_test_mode());
@@ skipping 17 matching lines @@
     // We may get a valid channel, but with a software renderer. In that case,
     // disable GPU compositing.
     if (gpu_channel_host->gpu_info().software_rendering)
       use_software = true;
   }
 
   if (use_software) {
     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 =
       SharedCompositorWorkerContextProvider();
   if (!worker_context_provider) {
     // Cause the compositor to wait and try again.
     return nullptr;
   }
 
   // The renderer compositor context doesn't do a lot of stuff, so we don't
@@ skipping 24 matching lines @@
   scoped_refptr<ContextProviderCommandBuffer> context_provider(
       new ContextProviderCommandBuffer(
           gpu_channel_host, gpu::GPU_STREAM_DEFAULT,
           gpu::GpuStreamPriority::NORMAL, gpu::kNullSurfaceHandle, url,
           automatic_flushes, support_locking, limits, attributes, share_context,
           command_buffer_metrics::RENDER_COMPOSITOR_CONTEXT));
 
   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));
   }
 #endif
   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*
 RenderThreadImpl::GetAssociatedInterfaceRegistry() {
   return &associated_interfaces_;
 }
 
 std::unique_ptr<cc::SwapPromise>
 RenderThreadImpl::RequestCopyOfOutputForLayoutTest(
     int32_t routing_id,
@@ skipping 417 matching lines @@
   }
 }
 
 void RenderThreadImpl::OnRendererInterfaceRequest(
     mojom::RendererAssociatedRequest request) {
   DCHECK(!renderer_binding_.is_bound());
   renderer_binding_.Bind(std::move(request));
 }
 
 }  // namespace content