Share SyncPointManager between ipc and in-process

content/gpu/gpu_child_thread.h

Index: content/gpu/gpu_child_thread.h
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
index a9ed8b956c665d0be7fe80ab72fbc330233be654..b7395fa5227652dbaceba1ad4289a0a7d9392454 100644
--- a/content/gpu/gpu_child_thread.h
+++ b/content/gpu/gpu_child_thread.h
@@ -22,6 +22,10 @@
 #include "gpu/config/gpu_info.h"
 #include "ui/gfx/native_widget_types.h"
 
+namespace gpu {
+class SyncPointManager;
+}
+
 namespace sandbox {
 class TargetServices;
 }
@@ -45,7 +49,8 @@ class GpuChildThread : public ChildThreadImpl {
                  GpuMemoryBufferFactory* gpu_memory_buffer_factory);
 
   GpuChildThread(const InProcessChildThreadParams& params,
-                 GpuMemoryBufferFactory* gpu_memory_buffer_factory);
+                 GpuMemoryBufferFactory* gpu_memory_buffer_factory,
+                 gpu::SyncPointManager* sync_point_manager_override);
 
   ~GpuChildThread() override;
 
@@ -88,6 +93,10 @@ class GpuChildThread : public ChildThreadImpl {
   sandbox::TargetServices* target_services_;
 #endif
 
+  // Can be null when overridden.
+  scoped_ptr<gpu::SyncPointManager> sync_point_manager_;

[piman, 2015/07/20 22:26:11]

This works, or you can also have it owned at a higher level (GpuMain).

[boliu, 2015/07/20 23:58:04]

Ahh yes, that's much better. Gets rid of this _overrid weirdness.

+  gpu::SyncPointManager* sync_point_manager_ptr_;
+
   scoped_ptr<GpuChannelManager> gpu_channel_manager_;
 
   // Information about the GPU, such as device and vendor ID.