| Index: content/browser/gpu/compositor_util.cc
|
| diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc
|
| index 66de1fe131eb1e593766ddef1cd4935ecfb7a680..32ffb3f311b5aacccd7ff078e9e5a610fb045116 100644
|
| --- a/content/browser/gpu/compositor_util.cc
|
| +++ b/content/browser/gpu/compositor_util.cc
|
| @@ -66,12 +66,6 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool* eof) {
|
| GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance();
|
| gpu::GpuPreferences gpu_preferences = GetGpuPreferencesFromCommandLine();
|
|
|
| - bool accelerated_vpx_disabled =
|
| - command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode);
|
| -#if defined(OS_WIN)
|
| - accelerated_vpx_disabled |= !gpu_preferences.enable_accelerated_vpx_decode;
|
| -#endif
|
| -
|
| const GpuFeatureInfo kGpuFeatureInfo[] = {
|
| {"2d_canvas",
|
| manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS),
|
| @@ -147,14 +141,6 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool* eof) {
|
| "Native GpuMemoryBuffers have been disabled, either via about:flags"
|
| " or command line.",
|
| true},
|
| - {"vpx_decode", manager->IsFeatureBlacklisted(
|
| - gpu::GPU_FEATURE_TYPE_ACCELERATED_VPX_DECODE) ||
|
| - manager->IsFeatureBlacklisted(
|
| - gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
|
| - accelerated_vpx_disabled,
|
| - "Accelerated VPx video decode has been disabled, either via blacklist"
|
| - " or the command line.",
|
| - true},
|
| {kWebGL2FeatureName,
|
| manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2),
|
| command_line.HasSwitch(switches::kDisableES3APIs),
|
|
|