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

Unified Diff: services/ui/gpu/gpu_main.cc

Issue 2934203002: exp/wip: Use ServerGpuMemoryBufferManager in browser.
Patch Set: . Created 3 years, 6 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 | « content/browser/gpu/browser_gpu_memory_buffer_manager.cc ('k') | services/ui/ws/gpu_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/gpu/gpu_main.cc
diff --git a/services/ui/gpu/gpu_main.cc b/services/ui/gpu/gpu_main.cc
index e590b355ac22ca6a93f94c3cd01a345626b7623f..854d91ac265041c20dcf4940dc688fcaa1df2a1e 100644
--- a/services/ui/gpu/gpu_main.cc
+++ b/services/ui/gpu/gpu_main.cc
@@ -200,11 +200,15 @@ void GpuMain::CreateFrameSinkManagerOnCompositorThread(
gpu_internal_.Bind(std::move(gpu_service_info));
- display_provider_ = base::MakeUnique<viz::GpuDisplayProvider>(
- gpu_command_service_,
+ display_provider_ =
+ base::MakeUnique<viz::GpuDisplayProvider>(gpu_command_service_,
+#if 0
base::MakeUnique<viz::ServerGpuMemoryBufferManager>(gpu_internal_.get(),
1 /* client_id */),
- image_factory);
+#else
+ nullptr,
+#endif
+ image_factory);
frame_sink_manager_ = base::MakeUnique<viz::MojoFrameSinkManager>(
true, display_provider_.get());
« no previous file with comments | « content/browser/gpu/browser_gpu_memory_buffer_manager.cc ('k') | services/ui/ws/gpu_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698