Decouple GpuCompositorFrameSink from DisplayCompositor

services/ui/surfaces/display_compositor.cc

 // Copyright 2015 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 "services/ui/surfaces/display_compositor.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/output/in_process_context_provider.h"
 #include "cc/output/texture_mailbox_deleter.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/surface.h"
+#include "components/display_compositor/gpu_display_compositor_frame_sink.h"
+#include "components/display_compositor/gpu_offscreen_compositor_frame_sink.h"
 #include "gpu/command_buffer/client/shared_memory_limits.h"
 #include "gpu/ipc/gpu_in_process_thread_service.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/ui/surfaces/display_output_surface.h"
-#include "services/ui/surfaces/gpu_display_compositor_frame_sink.h"
-#include "services/ui/surfaces/gpu_offscreen_compositor_frame_sink.h"
 
 #if defined(USE_OZONE)
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "services/ui/surfaces/display_output_surface_ozone.h"
 #endif
 
 namespace ui {
 
 DisplayCompositor::DisplayCompositor(
     scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_service,
     std::unique_ptr<gpu::GpuMemoryBufferManager> gpu_memory_buffer_manager,
     gpu::ImageFactory* image_factory,
     cc::mojom::DisplayCompositorRequest request,
     cc::mojom::DisplayCompositorClientPtr client)
     : manager_(cc::SurfaceManager::LifetimeType::REFERENCES),
       reference_manager_(&manager_),
       gpu_service_(std::move(gpu_service)),
       gpu_memory_buffer_manager_(std::move(gpu_memory_buffer_manager)),
       image_factory_(image_factory),
       task_runner_(base::ThreadTaskRunnerHandle::Get()),
       client_(std::move(client)),
       binding_(this, std::move(request)) {
   manager_.AddObserver(this);
 }
 
-void DisplayCompositor::AddSurfaceReferences(
-    const std::vector<cc::SurfaceReference>& references) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  for (const auto& reference : references) {
-    reference_manager_->AddSurfaceReference(reference.parent_id(),
-                                            reference.child_id());
-  }
-}
-
-void DisplayCompositor::RemoveSurfaceReferences(
-    const std::vector<cc::SurfaceReference>& references) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  // TODO(kylechar): Each remove reference can trigger GC, it would be better if
-  // we GC only once if removing multiple references.
-  for (const auto& reference : references) {
-    reference_manager_->RemoveSurfaceReference(reference.parent_id(),
-                                               reference.child_id());
-  }
-}
-
 DisplayCompositor::~DisplayCompositor() {
   DCHECK(thread_checker_.CalledOnValidThread());
   manager_.RemoveObserver(this);
 }
 
-void DisplayCompositor::OnCompositorFrameSinkClientConnectionLost(
+void DisplayCompositor::OnClientConnectionLost(
     const cc::FrameSinkId& frame_sink_id,
     bool destroy_compositor_frame_sink) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (destroy_compositor_frame_sink)
     compositor_frame_sinks_.erase(frame_sink_id);
   // TODO(fsamuel): Tell the display compositor host that the client connection
   // has been lost so that it can drop its private connection and allow a new
   // client instance to create a new CompositorFrameSink.
 }
 
-void DisplayCompositor::OnCompositorFrameSinkPrivateConnectionLost(
+void DisplayCompositor::OnPrivateConnectionLost(
     const cc::FrameSinkId& frame_sink_id,
     bool destroy_compositor_frame_sink) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (destroy_compositor_frame_sink)
     compositor_frame_sinks_.erase(frame_sink_id);
 }
 
 void DisplayCompositor::CreateDisplayCompositorFrameSink(
     const cc::FrameSinkId& frame_sink_id,
     gpu::SurfaceHandle surface_handle,
     cc::mojom::MojoCompositorFrameSinkAssociatedRequest request,
     cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client,
     cc::mojom::DisplayPrivateAssociatedRequest display_private_request) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_NE(surface_handle, gpu::kNullSurfaceHandle);
   DCHECK_EQ(0u, compositor_frame_sinks_.count(frame_sink_id));
 
   std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source(
       new cc::DelayBasedBeginFrameSource(
           base::MakeUnique<cc::DelayBasedTimeSource>(task_runner_.get())));
   std::unique_ptr<cc::Display> display =
       CreateDisplay(frame_sink_id, surface_handle, begin_frame_source.get());
 
   compositor_frame_sinks_[frame_sink_id] =
-      base::MakeUnique<GpuDisplayCompositorFrameSink>(
-          this, frame_sink_id, std::move(display),
+      base::MakeUnique<display_compositor::GpuDisplayCompositorFrameSink>(
+          this, &manager_, frame_sink_id, std::move(display),
           std::move(begin_frame_source), std::move(request),
           std::move(private_request), std::move(client),
           std::move(display_private_request));
 }
 
 void DisplayCompositor::CreateOffscreenCompositorFrameSink(
     const cc::FrameSinkId& frame_sink_id,
     cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_EQ(0u, compositor_frame_sinks_.count(frame_sink_id));
 
   compositor_frame_sinks_[frame_sink_id] =
-      base::MakeUnique<GpuOffscreenCompositorFrameSink>(
-          this, frame_sink_id, std::move(request), std::move(private_request),
-          std::move(client));
+      base::MakeUnique<display_compositor::GpuOffscreenCompositorFrameSink>(
+          this, &manager_, frame_sink_id, std::move(request),
+          std::move(private_request), std::move(client));
 }
 
 std::unique_ptr<cc::Display> DisplayCompositor::CreateDisplay(
     const cc::FrameSinkId& frame_sink_id,
     gpu::SurfaceHandle surface_handle,
     cc::SyntheticBeginFrameSource* begin_frame_source) {
   scoped_refptr<cc::InProcessContextProvider> context_provider =
       new cc::InProcessContextProvider(
           gpu_service_, surface_handle, gpu_memory_buffer_manager_.get(),
           image_factory_, gpu::SharedMemoryLimits(),
@@ skipping 40 matching lines @@
   DCHECK_GT(surface_info.device_scale_factor(), 0.0f);
 
   if (client_)
     client_->OnSurfaceCreated(surface_info);
 }
 
 void DisplayCompositor::OnSurfaceDamaged(const cc::SurfaceId& surface_id,
                                          bool* changed) {}
 
 }  // namespace ui