| Index: gpu/ipc/service/gpu_channel_manager.cc
|
| diff --git a/gpu/ipc/service/gpu_channel_manager.cc b/gpu/ipc/service/gpu_channel_manager.cc
|
| index a6a099c63003f08250e56b31fa7c6635aaca2171..a6dc628c9ad4aaecd075d1e6e8f710c05c5173c8 100644
|
| --- a/gpu/ipc/service/gpu_channel_manager.cc
|
| +++ b/gpu/ipc/service/gpu_channel_manager.cc
|
| @@ -52,7 +52,8 @@ GpuChannelManager::GpuChannelManager(
|
| base::WaitableEvent* shutdown_event,
|
| SyncPointManager* sync_point_manager,
|
| GpuMemoryBufferFactory* gpu_memory_buffer_factory,
|
| - const GpuFeatureInfo& gpu_feature_info)
|
| + const GpuFeatureInfo& gpu_feature_info,
|
| + GpuProcessActivityFlags activity_flags)
|
| : task_runner_(task_runner),
|
| io_task_runner_(io_task_runner),
|
| gpu_preferences_(gpu_preferences),
|
| @@ -67,6 +68,7 @@ GpuChannelManager::GpuChannelManager(
|
| gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
|
| gpu_feature_info_(gpu_feature_info),
|
| exiting_for_lost_context_(false),
|
| + activity_flags_(std::move(activity_flags)),
|
| weak_factory_(this) {
|
| DCHECK(task_runner);
|
| DCHECK(io_task_runner);
|
| @@ -91,9 +93,9 @@ gles2::ProgramCache* GpuChannelManager::program_cache() {
|
| gpu_preferences_.disable_gpu_shader_disk_cache ||
|
| workarounds.disable_program_disk_cache;
|
| program_cache_.reset(new gles2::MemoryProgramCache(
|
| - gpu_preferences_.gpu_program_cache_size,
|
| - disable_disk_cache,
|
| - workarounds.disable_program_caching_for_transform_feedback));
|
| + gpu_preferences_.gpu_program_cache_size, disable_disk_cache,
|
| + workarounds.disable_program_caching_for_transform_feedback,
|
| + &activity_flags_));
|
| }
|
| return program_cache_.get();
|
| }
|
|
|