Move display_ From CompositorFrameSinkSupport To GpuDisplayCompositorFrameSink

components/display_compositor/gpu_display_compositor_frame_sink.cc

Index: components/display_compositor/gpu_display_compositor_frame_sink.cc
diff --git a/components/display_compositor/gpu_display_compositor_frame_sink.cc b/components/display_compositor/gpu_display_compositor_frame_sink.cc
index a69dbe43a956212930b0b758c0073d18f1b4a03b..a2b464a152846f83bffde297316b9d637d780c57 100644
--- a/components/display_compositor/gpu_display_compositor_frame_sink.cc
+++ b/components/display_compositor/gpu_display_compositor_frame_sink.cc
@@ -18,9 +18,13 @@ GpuDisplayCompositorFrameSink::GpuDisplayCompositorFrameSink(
     cc::mojom::MojoCompositorFrameSinkClientPtr client,
     cc::mojom::DisplayPrivateAssociatedRequest display_private_request)
     : GpuCompositorFrameSink(delegate,
-                             surface_manager,
-                             frame_sink_id,
-                             display.get(),
+                             base::MakeUnique<cc::CompositorFrameSinkSupport>(
+                                 this,
+                                 surface_manager,
+                                 frame_sink_id,
+                                 true /* handles_frame_sink_id_invalidation */,
+                                 true /* needs_sync_points */,
+                                 true /* submits_to_display_compositor */),
                              std::move(compositor_frame_sink_private_request),
                              std::move(client)),
       binding_(this, std::move(request)),
@@ -30,30 +34,45 @@ GpuDisplayCompositorFrameSink::GpuDisplayCompositorFrameSink(
   binding_.set_connection_error_handler(
       base::Bind(&GpuDisplayCompositorFrameSink::OnClientConnectionLost,
                  base::Unretained(this)));
+  display_->Initialize(this, surface_manager);
   display_->SetVisible(true);
 }
 
 GpuDisplayCompositorFrameSink::~GpuDisplayCompositorFrameSink() = default;
 
 void GpuDisplayCompositorFrameSink::SetDisplayVisible(bool visible) {
-  DCHECK(support_.display());
+  DCHECK(display_);
   display_->SetVisible(visible);
 }
 
 void GpuDisplayCompositorFrameSink::ResizeDisplay(const gfx::Size& size) {
-  DCHECK(support_.display());
+  DCHECK(display_);
   display_->Resize(size);
 }
 
 void GpuDisplayCompositorFrameSink::SetDisplayColorSpace(
     const gfx::ColorSpace& color_space) {
-  DCHECK(support_.display());
+  DCHECK(display_);
   display_->SetColorSpace(color_space);
 }
 
 void GpuDisplayCompositorFrameSink::SetOutputIsSecure(bool secure) {
-  DCHECK(support_.display());
+  DCHECK(display_);
   display_->SetOutputIsSecure(secure);
 }
 
+void GpuDisplayCompositorFrameSink::SetLocalSurfaceId(
+    const cc::LocalSurfaceId& local_surface_id,
+    float scale_factor) {
+  display_->SetLocalSurfaceId(local_surface_id, scale_factor);
+}
+
+void GpuDisplayCompositorFrameSink::DisplayOutputSurfaceLost() {}
+
+void GpuDisplayCompositorFrameSink::DisplayWillDrawAndSwap(
+    bool will_draw_and_swap,
+    const cc::RenderPassList& render_passes) {}
+
+void GpuDisplayCompositorFrameSink::DisplayDidDrawAndSwap() {}
+
 }  // namespace display_compositor