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

Unified Diff: content/gpu/gpu_child_thread.h

Issue 1908223002: Remove content/gpu from content/browser/android/DEPS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owned_sync_point_manager_ Created 4 years, 8 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/content_gpu.gypi ('k') | content/gpu/gpu_child_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_child_thread.h
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
index 597afef350594cb156c1d1b83d028d2f5a2ac258..235ad0aacabb57e2ca6f662f6560bc37f3fb0508 100644
--- a/content/gpu/gpu_child_thread.h
+++ b/content/gpu/gpu_child_thread.h
@@ -64,13 +64,11 @@ class GpuChildThread : public ChildThreadImpl,
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;
@@ -162,8 +160,8 @@ class GpuChildThread : public ChildThreadImpl,
sandbox::TargetServices* target_services_;
#endif
- // Non-owning.
- gpu::SyncPointManager* sync_point_manager_;
+ // Can be null if overridden by ContentGpuClient.
+ std::unique_ptr<gpu::SyncPointManager> owned_sync_point_manager_;
std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_;
« no previous file with comments | « content/content_gpu.gypi ('k') | content/gpu/gpu_child_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698