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..70a2c8ad75fb01b30a2e889fcc532a8809638e24 100644 |
--- a/cc/surfaces/compositor_frame_sink_support.cc |
+++ b/cc/surfaces/compositor_frame_sink_support.cc |
@@ -17,22 +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) |
: 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), |
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() { |
@@ -76,14 +72,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, |
@@ -108,6 +104,7 @@ void CompositorFrameSinkSupport::DidReceiveCompositorFrameAck() { |
if (!client_) |
return; |
+ |
client_->DidReceiveCompositorFrameAck(); |
if (!surface_returned_resources_.empty()) { |
client_->ReclaimResources(surface_returned_resources_); |
@@ -132,6 +129,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( |