DirectCompositorFrameSink Uses CompositorFrameSinkSupport

cc/surfaces/compositor_frame_sink_support.cc

Index: cc/surfaces/compositor_frame_sink_support.cc
diff --git a/cc/surfaces/compositor_frame_sink_support.cc b/cc/surfaces/compositor_frame_sink_support.cc
index c36e35121216113a756f8550dfb60068a26f3b84..492fa3b2d7ddba5ce04efc22d9432b9b908fe0f2 100644
--- a/cc/surfaces/compositor_frame_sink_support.cc
+++ b/cc/surfaces/compositor_frame_sink_support.cc
@@ -17,7 +17,7 @@ CompositorFrameSinkSupport::CompositorFrameSinkSupport(
     CompositorFrameSinkSupportClient* client,
     SurfaceManager* surface_manager,
     const FrameSinkId& frame_sink_id,
-    std::unique_ptr<Display> display,
+    Display* display,
     std::unique_ptr<BeginFrameSource> display_begin_frame_source)
     : client_(client),
       surface_manager_(surface_manager),
@@ -26,13 +26,11 @@ CompositorFrameSinkSupport::CompositorFrameSinkSupport(
       display_(std::move(display)),
       surface_factory_(frame_sink_id_, surface_manager_, this),
       weak_factory_(this) {
-  surface_manager_->RegisterFrameSinkId(frame_sink_id_);
+  surface_manager->RegisterFrameSinkId(frame_sink_id_);
   surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
 
-  if (display_) {
+  if (display_)
     display_->Initialize(this, surface_manager_);
-    display_->SetVisible(true);
-  }
 }
 
 CompositorFrameSinkSupport::~CompositorFrameSinkSupport() {
@@ -132,6 +130,15 @@ void CompositorFrameSinkSupport::RemoveChildFrameSink(
   child_frame_sinks_.erase(it);
 }
 
+void CompositorFrameSinkSupport::SetNeedsSyncPoints(bool needs_sync_points) {
+  surface_factory_.set_needs_sync_points(needs_sync_points);
+}
+
+void CompositorFrameSinkSupport::ForceReclaimResources() {
+  if (local_frame_id_.is_valid())
+    surface_factory_.ClearSurface();
+}
+
 void CompositorFrameSinkSupport::DisplayOutputSurfaceLost() {}
 
 void CompositorFrameSinkSupport::DisplayWillDrawAndSwap(