| Index: content/common/gpu/gpu_channel_manager.h
|
| diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h
|
| index 875656f47b697e82be97ce436e0e9609a6c3198b..cd18afc916da66c5c850a13c3b59f91b2432db0b 100644
|
| --- a/content/common/gpu/gpu_channel_manager.h
|
| +++ b/content/common/gpu/gpu_channel_manager.h
|
| @@ -40,6 +40,7 @@ class GLShareGroup;
|
|
|
| namespace gpu {
|
| struct GpuPreferences;
|
| +class GpuDriverBugWorkarounds;
|
| class PreemptionFlag;
|
| class SyncPointClient;
|
| class SyncPointManager;
|
| @@ -73,14 +74,16 @@ class CONTENT_EXPORT GpuChannelManager {
|
| void(int32_t, const base::TimeTicks&, const base::TimeDelta&)>
|
| BufferPresentedCallback;
|
| #endif
|
| - GpuChannelManager(const gpu::GpuPreferences& gpu_preferences,
|
| - GpuChannelManagerDelegate* delegate,
|
| - GpuWatchdog* watchdog,
|
| - base::SingleThreadTaskRunner* task_runner,
|
| - base::SingleThreadTaskRunner* io_task_runner,
|
| - base::WaitableEvent* shutdown_event,
|
| - gpu::SyncPointManager* sync_point_manager,
|
| - GpuMemoryBufferFactory* gpu_memory_buffer_factory);
|
| + GpuChannelManager(
|
| + const gpu::GpuPreferences& gpu_preferences,
|
| + const gpu::GpuDriverBugWorkarounds& gpu_driver_bug_workarounds,
|
| + GpuChannelManagerDelegate* delegate,
|
| + GpuWatchdog* watchdog,
|
| + base::SingleThreadTaskRunner* task_runner,
|
| + base::SingleThreadTaskRunner* io_task_runner,
|
| + base::WaitableEvent* shutdown_event,
|
| + gpu::SyncPointManager* sync_point_manager,
|
| + GpuMemoryBufferFactory* gpu_memory_buffer_factory);
|
| virtual ~GpuChannelManager();
|
|
|
| GpuChannelManagerDelegate* delegate() const { return delegate_; }
|
| @@ -120,6 +123,9 @@ class CONTENT_EXPORT GpuChannelManager {
|
| const gpu::GpuPreferences& gpu_preferences() const {
|
| return gpu_preferences_;
|
| }
|
| + const gpu::GpuDriverBugWorkarounds& gpu_driver_bug_workarounds() const {
|
| + return gpu_driver_bug_workarounds_;
|
| + }
|
| gpu::gles2::ProgramCache* program_cache();
|
| gpu::gles2::ShaderTranslatorCache* shader_translator_cache();
|
| gpu::gles2::FramebufferCompletenessCache* framebuffer_completeness_cache();
|
| @@ -185,6 +191,8 @@ class CONTENT_EXPORT GpuChannelManager {
|
|
|
| const gpu::GpuPreferences& gpu_preferences_;
|
|
|
| + const gpu::GpuDriverBugWorkarounds& gpu_driver_bug_workarounds_;
|
| +
|
| GpuChannelManagerDelegate* const delegate_;
|
| #if defined(OS_MACOSX)
|
| base::hash_map<int32_t, BufferPresentedCallback>
|
|
|