Remove content/gpu from content/browser/android/DEPS

content/gpu/gpu_child_thread.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_GPU_GPU_CHILD_THREAD_H_
 #define CONTENT_GPU_GPU_CHILD_THREAD_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 46 matching lines @@
   typedef std::queue<IPC::Message*> DeferredMessages;
 
   // Returns the one gpu thread for this process. Note that this can only
   // be accessed when running on the gpu thread itself.
   static GpuChildThread* current();
 
   GpuChildThread(GpuWatchdogThread* gpu_watchdog_thread,
                  bool dead_on_arrival,
                  const gpu::GPUInfo& gpu_info,
                  const DeferredMessages& deferred_messages,
-                 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory,
-                 gpu::SyncPointManager* sync_point_manager);
+                 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory);
 
   GpuChildThread(const gpu::GpuPreferences& gpu_preferences,
                  const InProcessChildThreadParams& params,
-                 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory,
-                 gpu::SyncPointManager* sync_point_manager);
+                 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory);
 
   ~GpuChildThread() override;
 
   void Shutdown() override;
 
   void Init(const base::Time& process_start_time);
   void StopWatchdog();
 
   gpu::GpuPreferences gpu_preferences() { return gpu_preferences_; }
 
@@ skipping 71 matching lines @@
   // OnInitialize message, in which case we just declare ourselves DOA.
   bool dead_on_arrival_;
   base::Time process_start_time_;
   scoped_refptr<GpuWatchdogThread> watchdog_thread_;
 
 #if defined(OS_WIN)
   // Windows specific client sandbox interface.
   sandbox::TargetServices* target_services_;
 #endif
 
-  // Non-owning.
-  gpu::SyncPointManager* sync_point_manager_;
+  // Can be null if overridden by ContentGpuClient.

[piman, 2016/04/22 00:50:43]

nit: it can't be null - if ContentGpuClient doesn't provide one, we create the
default one, right?

[boliu, 2016/04/22 01:08:36]

It's the opposite case. If ContentGpuClient provides a SyncPointManager, that
SyncPointManager can't be owned by GpuChildThread, so can't set as
sync_point_manager_ here.

So the comment is correct, but I'm not sure if anything else you want
clarified..?

[piman, 2016/04/22 04:05:08]

Oh, I see - I misread the implementation because sync_point_manager and
sync_point_manager_ look alike.

Maybe make this owned_sync_point_manager_ to clarify that this is only used to
keep track of ownership?

[boliu, 2016/04/22 04:41:15]

Done. Also added a comment in .cc that manager from GpuClient can't be owned
here.

+  std::unique_ptr<gpu::SyncPointManager> sync_point_manager_;
 
   std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_;
 
   std::unique_ptr<MediaService> media_service_;
 
   // Information about the GPU, such as device and vendor ID.
   gpu::GPUInfo gpu_info_;
 
   // Error messages collected in gpu_main() before the thread is created.
   DeferredMessages deferred_messages_;
 
   // Whether the GPU thread is running in the browser process.
   bool in_browser_process_;
 
   // The gpu::GpuMemoryBufferFactory instance used to allocate GpuMemoryBuffers.
   gpu::GpuMemoryBufferFactory* const gpu_memory_buffer_factory_;
 
   // Process control for Mojo application hosting.
   std::unique_ptr<GpuProcessControlImpl> process_control_;
 
   // Bindings to the mojom::ProcessControl impl.
   mojo::BindingSet<mojom::ProcessControl> process_control_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChildThread);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_GPU_GPU_CHILD_THREAD_H_