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

Unified Diff: ui/compositor/test/in_process_context_factory.cc

Issue 2468633002: Replaced cc::Display::SetSurfaceId() with SetLocalFrameId() (Closed)
Patch Set: rebase and minor bug fixes 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
« no previous file with comments | « services/ui/ws/server_window_compositor_frame_sink.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index 5458c0e399ca5a06c9cf63ec12258a488b66ada3..42dd8b51c350b8115de56e86f054925bc811e745 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -191,10 +191,10 @@ void InProcessContextFactory::CreateCompositorFrameSink(
display_output_surface->capabilities().max_frames_pending));
per_compositor_data_[compositor.get()] = base::MakeUnique<cc::Display>(
&shared_bitmap_manager_, &gpu_memory_buffer_manager_,
- compositor->GetRendererSettings(), std::move(begin_frame_source),
- std::move(display_output_surface), std::move(scheduler),
- base::MakeUnique<cc::TextureMailboxDeleter>(
- compositor->task_runner().get()));
+ compositor->GetRendererSettings(), compositor->frame_sink_id(),
+ std::move(begin_frame_source), std::move(display_output_surface),
+ std::move(scheduler), base::MakeUnique<cc::TextureMailboxDeleter>(
+ compositor->task_runner().get()));
auto* display = per_compositor_data_[compositor.get()].get();
auto compositor_frame_sink = base::MakeUnique<cc::DirectCompositorFrameSink>(
« no previous file with comments | « services/ui/ws/server_window_compositor_frame_sink.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698