Introduce FrameSinkManagerHost in content/browser/.

content/browser/renderer_host/compositor_impl_android.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/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 #include <stdint.h>
 #include <unordered_set>
@@ skipping 31 matching lines @@
 #include "cc/resources/ui_resource_manager.h"
 #include "cc/surfaces/direct_compositor_frame_sink.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/frame_sink_id_allocator.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator_android.h"
 #include "components/display_compositor/gl_helper.h"
 #include "components/display_compositor/host_shared_bitmap_manager.h"
+#include "content/browser/compositor/frame_sink_manager_host.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/android/compositor_client.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
@@ skipping 28 matching lines @@
     Start("CompositorTileWorker1", base::SimpleThread::Options());
   }
 
   ~SingleThreadTaskGraphRunner() override { Shutdown(); }
 };
 
 struct CompositorDependencies {
   CompositorDependencies() : frame_sink_id_allocator(kDefaultClientId) {}
 
   SingleThreadTaskGraphRunner task_graph_runner;
-  cc::SurfaceManager surface_manager;
+  FrameSinkManagerHost frame_sink_manager_host;
   cc::FrameSinkIdAllocator frame_sink_id_allocator;
 
 #if BUILDFLAG(ENABLE_VULKAN)
   scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider;
 #endif
 };
 
 base::LazyInstance<CompositorDependencies>::DestructorAtExit
     g_compositor_dependencies = LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 278 matching lines @@
     gpu::gles2::ContextCreationAttribHelper attributes,
     gpu::SharedMemoryLimits shared_memory_limits,
     ContextProviderCallback callback) {
   BrowserGpuChannelHostFactory::instance()->EstablishGpuChannel(
       base::Bind(&CreateContextProviderAfterGpuChannelEstablished, handle,
                  attributes, shared_memory_limits, callback));
 }
 
 // static
 cc::SurfaceManager* CompositorImpl::GetSurfaceManager() {
-  return &g_compositor_dependencies.Get().surface_manager;
+  return g_compositor_dependencies.Get()
+      .frame_sink_manager_host.surface_manager();
 }
 
 // static
+FrameSinkManagerHost* CompositorImpl::GetFrameSinkManagerHost() {
+  return &g_compositor_dependencies.Get().frame_sink_manager_host;
+}
+
+// static
 cc::FrameSinkId CompositorImpl::AllocateFrameSinkId() {
   return g_compositor_dependencies.Get()
       .frame_sink_id_allocator.NextFrameSinkId();
 }
 
 // static
 bool CompositorImpl::IsInitialized() {
   return g_initialized;
 }
 
@@ skipping 449 matching lines @@
   }
   GetSurfaceManager()->UnregisterFrameSinkHierarchy(frame_sink_id_,
                                                     frame_sink_id);
 }
 
 bool CompositorImpl::HavePendingReadbacks() {
   return !readback_layer_tree_->children().empty();
 }
 
 }  // namespace content