GpuDisplayCompositorFrameSink => GpuRootCompositorFrameSink

components/display_compositor/gpu_compositor_frame_sink.cc

Index: components/display_compositor/gpu_compositor_frame_sink.cc
diff --git a/components/display_compositor/gpu_compositor_frame_sink.cc b/components/display_compositor/gpu_compositor_frame_sink.cc
index a5bd246c01ec50b745c7f8877ed9c04b5889c8a2..58b833dfe56cf8cc01f8c306715ed15634c85caf 100644
--- a/components/display_compositor/gpu_compositor_frame_sink.cc
+++ b/components/display_compositor/gpu_compositor_frame_sink.cc
@@ -10,16 +10,27 @@ namespace display_compositor {
 
 GpuCompositorFrameSink::GpuCompositorFrameSink(
     GpuCompositorFrameSinkDelegate* delegate,
-    std::unique_ptr<cc::CompositorFrameSinkSupport> support,
+    cc::SurfaceManager* surface_manager,
+    const cc::FrameSinkId& frame_sink_id,
+    cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkPrivateRequest
         compositor_frame_sink_private_request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client)
     : delegate_(delegate),
-      support_(std::move(support)),
+      support_(base::MakeUnique<cc::CompositorFrameSinkSupport>(
+          this,
+          surface_manager,
+          frame_sink_id,
+          false /* is_root */,
+          true /* handles_frame_sink_id_invalidation */,
+          true /* needs_sync_points */)),
       client_(std::move(client)),
+      compositor_frame_sink_binding_(this, std::move(request)),
       compositor_frame_sink_private_binding_(
           this,
           std::move(compositor_frame_sink_private_request)) {
+  compositor_frame_sink_binding_.set_connection_error_handler(base::Bind(
+      &GpuCompositorFrameSink::OnClientConnectionLost, base::Unretained(this)));
   compositor_frame_sink_private_binding_.set_connection_error_handler(
       base::Bind(&GpuCompositorFrameSink::OnPrivateConnectionLost,
                  base::Unretained(this)));
@@ -65,6 +76,11 @@ void GpuCompositorFrameSink::RemoveChildFrameSink(
   support_->RemoveChildFrameSink(child_frame_sink_id);
 }
 
+void GpuCompositorFrameSink::RequestCopyOfSurface(
+    std::unique_ptr<cc::CopyOutputRequest> request) {
+  support_->RequestCopyOfSurface(std::move(request));
+}
+
 void GpuCompositorFrameSink::OnBeginFrame(const cc::BeginFrameArgs& args) {
   if (client_)
     client_->OnBeginFrame(args);
@@ -97,9 +113,4 @@ void GpuCompositorFrameSink::OnPrivateConnectionLost() {
                                      client_connection_lost_);
 }
 
-void GpuCompositorFrameSink::RequestCopyOfSurface(
-    std::unique_ptr<cc::CopyOutputRequest> request) {
-  support_->RequestCopyOfSurface(std::move(request));
-}
-
 }  // namespace display_compositor