DirectCompositorFrameSink Uses CompositorFrameSinkSupport

cc/surfaces/compositor_frame_sink_support.h

Index: cc/surfaces/compositor_frame_sink_support.h
diff --git a/cc/surfaces/compositor_frame_sink_support.h b/cc/surfaces/compositor_frame_sink_support.h
index f0e19694704260d10b1a1d79a46b9bcf5e2ffa41..8ee0b17502e255c9d66200f2b50f453b66a733c5 100644
--- a/cc/surfaces/compositor_frame_sink_support.h
+++ b/cc/surfaces/compositor_frame_sink_support.h
@@ -26,15 +26,15 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport
       public SurfaceFactoryClient,
       public BeginFrameObserver {
  public:
-  CompositorFrameSinkSupport(
-      CompositorFrameSinkSupportClient* client,
-      SurfaceManager* surface_manager,
-      const FrameSinkId& frame_sink_id,
-      std::unique_ptr<Display> display,
-      std::unique_ptr<BeginFrameSource> display_begin_frame_source);
+  CompositorFrameSinkSupport(CompositorFrameSinkSupportClient* client,
+                             SurfaceManager* surface_manager,
+                             const FrameSinkId& frame_sink_id,
+                             Display* display);
 
   ~CompositorFrameSinkSupport() override;
 
+  void InvalidateFrameSinkId();
+
   const FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
 
   void EvictFrame();
@@ -46,8 +46,10 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport
   void Satisfy(const SurfaceSequence& sequence);
   void AddChildFrameSink(const FrameSinkId& child_frame_sink_id);
   void RemoveChildFrameSink(const FrameSinkId& child_frame_sink_id);
+  void SetNeedsSyncPoints(bool needs_sync_points);
+  void ForceReclaimResources();
 
-  Display* display() { return display_.get(); }
+  Display* display() { return display_; }
 
  private:
   void DidReceiveCompositorFrameAck();
@@ -77,11 +79,7 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport
 
   const FrameSinkId frame_sink_id_;
 
-  // GpuCompositorFrameSink holds a Display and its BeginFrameSource if it
-  // created with non-null gpu::SurfaceHandle. In the window server, the display
-  // root window's CompositorFrameSink will have a valid gpu::SurfaceHandle.
-  std::unique_ptr<BeginFrameSource> display_begin_frame_source_;
-  std::unique_ptr<Display> display_;
+  Display* display_;
 
   LocalFrameId local_frame_id_;
   SurfaceFactory surface_factory_;