Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3276)

Unified Diff: cc/surfaces/compositor_frame_sink_support.cc

Issue 2612083002: DirectCompositorFrameSink Uses CompositorFrameSinkSupport (Closed)
Patch Set: CompositorImpl::AddChildFrameSink() and CompositorImpl::RemoveChildFrameSink() replace DelegatedFra… Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 95222ed1defc2354e69faf20ac12300a4b439b61..eb30244302ca08055678afd5b2300c33ec1044be 100644
--- a/cc/surfaces/compositor_frame_sink_support.cc
+++ b/cc/surfaces/compositor_frame_sink_support.cc
@@ -17,13 +17,11 @@ 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_);
@@ -62,14 +60,14 @@ void CompositorFrameSinkSupport::SubmitCompositorFrame(
const LocalSurfaceId& local_surface_id,
CompositorFrame frame) {
++ack_pending_count_;
- surface_factory_.SubmitCompositorFrame(
- local_surface_id, std::move(frame),
- base::Bind(&CompositorFrameSinkSupport::DidReceiveCompositorFrameAck,
- weak_factory_.GetWeakPtr()));
if (display_) {
display_->SetLocalSurfaceId(local_surface_id,
frame.metadata.device_scale_factor);
}
+ surface_factory_.SubmitCompositorFrame(
+ local_surface_id, std::move(frame),
+ base::Bind(&CompositorFrameSinkSupport::DidReceiveCompositorFrameAck,
+ weak_factory_.GetWeakPtr()));
}
void CompositorFrameSinkSupport::Require(const LocalSurfaceId& local_surface_id,
@@ -88,6 +86,7 @@ void CompositorFrameSinkSupport::DidReceiveCompositorFrameAck() {
if (!client_)
return;
+
client_->DidReceiveCompositorFrameAck();
if (!surface_returned_resources_.empty()) {
client_->ReclaimResources(surface_returned_resources_);
@@ -112,6 +111,14 @@ 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() {
+ surface_factory_.ClearSurface();
+}
+
void CompositorFrameSinkSupport::DisplayOutputSurfaceLost() {}
void CompositorFrameSinkSupport::DisplayWillDrawAndSwap(

Powered by Google App Engine
This is Rietveld 408576698