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

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

Issue 2144393003: cc: Allow TestDelegatingOutputSurface to be used for non-pixel tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « services/ui/surfaces/display_compositor.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 b2f4bfeee7bec8005f0585be8177b78b933bec4d..30d73b1bcaeb5170ea4e69fc2528175e8f75f478 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -176,12 +176,11 @@ void InProcessContextFactory::CreateOutputSurface(
begin_frame_source.get(), compositor->task_runner().get(),
display_output_surface->capabilities().max_frames_pending));
per_compositor_data_[compositor.get()] = base::MakeUnique<cc::Display>(
- surface_manager_, GetSharedBitmapManager(), GetGpuMemoryBufferManager(),
- compositor->GetRendererSettings(),
- compositor->surface_id_allocator()->client_id(),
- std::move(begin_frame_source), std::move(display_output_surface),
- std::move(scheduler), base::MakeUnique<cc::TextureMailboxDeleter>(
- compositor->task_runner().get()));
+ GetSharedBitmapManager(), GetGpuMemoryBufferManager(),
+ compositor->GetRendererSettings(), 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();
std::unique_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface(
« no previous file with comments | « services/ui/surfaces/display_compositor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698