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

Unified Diff: content/gpu/gpu_main.cc

Issue 1231263003: Share SyncPointManager between ipc and in-process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove forward decl/includes Created 5 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 | « content/gpu/gpu_child_thread.cc ('k') | content/gpu/in_process_gpu_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_main.cc
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 3cfb8c4605e599737f27ea2851543be98415a747..0bd536ad6362f0cc69dc358919b717bb6c0dec08 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -35,6 +35,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/main_function_params.h"
#include "gpu/command_buffer/service/gpu_switches.h"
+#include "gpu/command_buffer/service/sync_point_manager.h"
#include "gpu/config/gpu_info_collector.h"
#include "gpu/config/gpu_switches.h"
#include "gpu/config/gpu_util.h"
@@ -355,12 +356,14 @@ int GpuMain(const MainFunctionParams& parameters) {
scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory =
GpuMemoryBufferFactory::Create(
GpuChildThread::GetGpuMemoryBufferFactoryType());
+ gpu::SyncPointManager sync_point_manager(false);
GpuProcess gpu_process;
GpuChildThread* child_thread = new GpuChildThread(
watchdog_thread.get(), dead_on_arrival, gpu_info, deferred_messages.Get(),
- gpu_memory_buffer_factory.get());
+ gpu_memory_buffer_factory.get(),
+ &sync_point_manager);
while (!deferred_messages.Get().empty())
deferred_messages.Get().pop();
« no previous file with comments | « content/gpu/gpu_child_thread.cc ('k') | content/gpu/in_process_gpu_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698