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

Unified Diff: cc/surfaces/direct_compositor_frame_sink.cc

Issue 2468633002: Replaced cc::Display::SetSurfaceId() with SetLocalFrameId() (Closed)
Patch Set: Fixed Android compile errors Created 4 years, 1 month 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/direct_compositor_frame_sink.cc
diff --git a/cc/surfaces/direct_compositor_frame_sink.cc b/cc/surfaces/direct_compositor_frame_sink.cc
index b504ab1539ea12530f910a0f58d37c0719386b27..31dcf7383074857d05f029664964911238ed36b0 100644
--- a/cc/surfaces/direct_compositor_frame_sink.cc
+++ b/cc/surfaces/direct_compositor_frame_sink.cc
@@ -74,7 +74,7 @@ bool DirectCompositorFrameSink::BindToClient(
// Avoid initializing GL context here, as this should be sharing the
// Display's context.
- display_->Initialize(this, surface_manager_, frame_sink_id_);
+ display_->Initialize(this, surface_manager_);
return true;
}
@@ -98,8 +98,8 @@ void DirectCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
factory_.Create(delegated_local_frame_id_);
last_swap_frame_size_ = frame_size;
}
- display_->SetSurfaceId(SurfaceId(frame_sink_id_, delegated_local_frame_id_),
- frame.metadata.device_scale_factor);
+ display_->SetLocalFrameId(delegated_local_frame_id_,
+ frame.metadata.device_scale_factor);
factory_.SubmitCompositorFrame(
delegated_local_frame_id_, std::move(frame),

Powered by Google App Engine
This is Rietveld 408576698