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

Unified Diff: cc/surfaces/direct_compositor_frame_sink.cc

Issue 2661543002: Rename LocalFrameId to LocalSurfaceId (Closed)
Patch Set: c 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
« no previous file with comments | « cc/surfaces/direct_compositor_frame_sink.h ('k') | cc/surfaces/display.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 01239ee9f822df7c1f589bf8691e0857cf804881..10c37ee7cc3842ae45d3b48987aead9a936d9612 100644
--- a/cc/surfaces/direct_compositor_frame_sink.cc
+++ b/cc/surfaces/direct_compositor_frame_sink.cc
@@ -90,20 +90,20 @@ void DirectCompositorFrameSink::DetachFromClient() {
void DirectCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size();
if (frame_size.IsEmpty() || frame_size != last_swap_frame_size_) {
- delegated_local_frame_id_ = surface_id_allocator_.GenerateId();
+ delegated_local_surface_id_ = surface_id_allocator_.GenerateId();
last_swap_frame_size_ = frame_size;
}
- display_->SetLocalFrameId(delegated_local_frame_id_,
- frame.metadata.device_scale_factor);
+ display_->SetLocalSurfaceId(delegated_local_surface_id_,
+ frame.metadata.device_scale_factor);
factory_.SubmitCompositorFrame(
- delegated_local_frame_id_, std::move(frame),
+ delegated_local_surface_id_, std::move(frame),
base::Bind(&DirectCompositorFrameSink::DidDrawCallback,
base::Unretained(this)));
}
void DirectCompositorFrameSink::ForceReclaimResources() {
- if (delegated_local_frame_id_.is_valid())
+ if (delegated_local_surface_id_.is_valid())
factory_.ClearSurface();
}
« no previous file with comments | « cc/surfaces/direct_compositor_frame_sink.h ('k') | cc/surfaces/display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698