| Index: content/browser/gpu/gpu_data_manager_impl_private.cc
|
| diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
|
| index 89da2e6a8873e0e0884ff240d37ce356b3607228..5e04178628b6db58556fad91bc71a842cfd790ff 100644
|
| --- a/content/browser/gpu/gpu_data_manager_impl_private.cc
|
| +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
|
| @@ -179,7 +179,7 @@ void UpdateStats(const gpu::GPUInfo& gpu_info,
|
| command_line.HasSwitch(switches::kDisableGpu),
|
| command_line.HasSwitch(switches::kDisableGpuRasterization),
|
| command_line.HasSwitch(switches::kDisableExperimentalWebGL),
|
| - (!command_line.HasSwitch(switches::kEnableUnsafeES3APIs) ||
|
| + (!command_line.HasSwitch(switches::kEnableES3APIs) ||
|
| command_line.HasSwitch(switches::kDisableES3APIs))};
|
| #if defined(OS_WIN)
|
| const std::string kGpuBlacklistFeatureHistogramNamesWin[] = {
|
| @@ -765,8 +765,14 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine(
|
| }
|
| #endif
|
|
|
| - if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2) && gpu_preferences) {
|
| - gpu_preferences->enable_unsafe_es3_apis = false;
|
| + if (gpu_preferences) { // enable_unsafe_es3_apis
|
| + bool blacklisted = IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2);
|
| + bool enabled = base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableES3APIs);
|
| + bool disabled = base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kDisableES3APIs);
|
| + gpu_preferences->enable_unsafe_es3_apis =
|
| + (enabled || !blacklisted) && !disabled;
|
| }
|
|
|
| // Pass GPU and driver information to GPU process. We try to avoid full GPU
|
|
|