Index: content/browser/gpu/compositor_util.cc |
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc |
index acaf0584a49c84c84fe1f3efb49ba24bb0e72efa..a40bc8f17e0dd683a1f90ddbb11df0332d9067bf 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), |
@@ -148,15 +142,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), |