| 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 e76b373bb3c981965d65885c61d9dbf592772f8d..f15ee3a59123bdeacb3d6516dd94cf86cf9d7060 100644
|
| --- a/content/common/gpu/gpu_channel_manager.h
|
| +++ b/content/common/gpu/gpu_channel_manager.h
|
| @@ -36,6 +36,7 @@ class GLShareGroup;
|
| }
|
|
|
| namespace gpu {
|
| +struct GpuPreferences;
|
| class PreemptionFlag;
|
| class SyncPointClient;
|
| class SyncPointManager;
|
| @@ -69,7 +70,8 @@ struct BufferPresentedParams;
|
| // browser process to them based on the corresponding renderer ID.
|
| class CONTENT_EXPORT GpuChannelManager {
|
| public:
|
| - GpuChannelManager(GpuChannelManagerDelegate* delegate,
|
| + GpuChannelManager(const gpu::GpuPreferences& gpu_preferences,
|
| + GpuChannelManagerDelegate* delegate,
|
| GpuWatchdog* watchdog,
|
| base::SingleThreadTaskRunner* task_runner,
|
| base::SingleThreadTaskRunner* io_task_runner,
|
| @@ -106,6 +108,9 @@ class CONTENT_EXPORT GpuChannelManager {
|
| void BufferPresented(const BufferPresentedParams& params);
|
| #endif
|
|
|
| + const gpu::GpuPreferences& gpu_preferences() const {
|
| + return gpu_preferences_;
|
| + }
|
| gpu::gles2::ProgramCache* program_cache();
|
| gpu::gles2::ShaderTranslatorCache* shader_translator_cache();
|
| gpu::gles2::FramebufferCompletenessCache* framebuffer_completeness_cache();
|
| @@ -169,6 +174,8 @@ class CONTENT_EXPORT GpuChannelManager {
|
| void DoWakeUpGpu();
|
| #endif
|
|
|
| + const gpu::GpuPreferences& gpu_preferences_;
|
| +
|
| GpuChannelManagerDelegate* const delegate_;
|
| #if defined(OS_MACOSX)
|
| IDMap<ImageTransportHelper> image_transport_map_;
|
|
|