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 2b88ceafb56d93a83558c21dbb9d96bb605124b4..be5b181dc1ca47c19ca83e051c801d7d3ef1e154 100644
--- a/cc/surfaces/compositor_frame_sink_support.cc
+++ b/cc/surfaces/compositor_frame_sink_support.cc
@@ -17,16 +17,18 @@ CompositorFrameSinkSupport::CompositorFrameSinkSupport(
     CompositorFrameSinkSupportClient* client,
     SurfaceManager* surface_manager,
     const FrameSinkId& frame_sink_id,
-    std::unique_ptr<Display> display,
-    std::unique_ptr<BeginFrameSource> display_begin_frame_source)
+    Display* display,
+    bool direct_compositor_frame_sink)
     : client_(client),
       surface_manager_(surface_manager),
       frame_sink_id_(frame_sink_id),
-      display_begin_frame_source_(std::move(display_begin_frame_source)),
-      display_(std::move(display)),
+      display_(display),
       surface_factory_(frame_sink_id_, surface_manager_, this),
+      direct_compositor_frame_sink_(direct_compositor_frame_sink),
       weak_factory_(this) {
-  surface_manager_->RegisterFrameSinkId(frame_sink_id_);
+  if (!direct_compositor_frame_sink_)
+    surface_manager_->RegisterFrameSinkId(frame_sink_id_);
+
   surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
 
   if (display_) {
@@ -46,7 +48,8 @@ CompositorFrameSinkSupport::~CompositorFrameSinkSupport() {
   // |surface_factory_|'s resources early on.
   surface_factory_.EvictSurface();
   surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
-  surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
+  if (!direct_compositor_frame_sink_)
+    surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void CompositorFrameSinkSupport::EvictFrame() {
@@ -76,14 +79,14 @@ void CompositorFrameSinkSupport::SubmitCompositorFrame(
     }
   }
   ++ack_pending_count_;
-  surface_factory_.SubmitCompositorFrame(
-      local_frame_id_, std::move(frame),
-      base::Bind(&CompositorFrameSinkSupport::DidReceiveCompositorFrameAck,
-                 weak_factory_.GetWeakPtr()));
   if (display_) {
     display_->SetLocalFrameId(local_frame_id_,
                               frame.metadata.device_scale_factor);
   }
+  surface_factory_.SubmitCompositorFrame(
+      local_frame_id_, std::move(frame),
+      base::Bind(&CompositorFrameSinkSupport::DidReceiveCompositorFrameAck,
+                 weak_factory_.GetWeakPtr()));
 }
 
 void CompositorFrameSinkSupport::Require(const LocalFrameId& local_frame_id,
@@ -102,6 +105,7 @@ void CompositorFrameSinkSupport::DidReceiveCompositorFrameAck() {
 
   if (!client_)
     return;
+
   client_->DidReceiveCompositorFrameAck();
   if (!surface_returned_resources_.empty()) {
     client_->ReclaimResources(surface_returned_resources_);
@@ -126,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(