Remove GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE and related code

BUG=1161303
TEST=bots
R=magchen@chromium.org,kbr@chromium.org

Change-Id: I1dfbb9a4cd15c7d8a9e1501c3fd697ae055e05bf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2600795Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839002}

content/browser/gpu/compositor_util.cc

@@ -124,13 +124,6 @@ const GpuFeatureData GetGpuFeatureData(
      DisableInfo::Problem(
          "WebGL has been disabled via blocklist or the command line."),
      false},
-    {"protected_video_decode",
-     SafeGetFeatureStatus(gpu_feature_info,
-                          gpu::GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE),
-     false,
-     DisableInfo::Problem(
-         "Protected video decode has been disabled, via blocklist."),
-     false},
     {"video_decode",
      SafeGetFeatureStatus(gpu_feature_info,
                           gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),

content/browser/gpu/gpu_data_manager_testing_arrays_and_structs_autogen.h

@@ -171,14 +171,13 @@ const GpuControlList::More kMoreForEntry5_572251052Exception0 = {
     GpuControlList::kDontCare,  // subpixel_font_rendering
 };
 
-const int kFeatureListForGpuManagerTestingEntry6[11] = {
+const int kFeatureListForGpuManagerTestingEntry6[10] = {
     GPU_FEATURE_TYPE_ACCELERATED_WEBGL2,
     GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL,
     GPU_FEATURE_TYPE_GPU_RASTERIZATION,
     GPU_FEATURE_TYPE_ACCELERATED_GL,
     GPU_FEATURE_TYPE_METAL,
     GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS,
-    GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE,
     GPU_FEATURE_TYPE_OOP_RASTERIZATION,
     GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE,
     GPU_FEATURE_TYPE_ACCELERATED_WEBGL,

gpu/config/gpu_blocklist.cc

@@ -35,8 +35,6 @@ std::unique_ptr<GpuBlocklist> GpuBlocklist::Create(
                             GPU_FEATURE_TYPE_GPU_RASTERIZATION);
   list->AddSupportedFeature("accelerated_webgl2",
                             GPU_FEATURE_TYPE_ACCELERATED_WEBGL2);
-  list->AddSupportedFeature("protected_video_decode",
-                            GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE);
   list->AddSupportedFeature("oop_rasterization",
                             GPU_FEATURE_TYPE_OOP_RASTERIZATION);
   list->AddSupportedFeature("android_surface_control",

gpu/config/gpu_blocklist_unittest.cc

@@ -96,9 +96,6 @@ GPU_BLOCKLIST_FEATURE_TEST(OOPRasterization, GPU_FEATURE_TYPE_OOP_RASTERIZATION)
 
 GPU_BLOCKLIST_FEATURE_TEST(WebGL2, GPU_FEATURE_TYPE_ACCELERATED_WEBGL2)
 
-GPU_BLOCKLIST_FEATURE_TEST(ProtectedVideoDecode,
-                           GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE)
-
 GPU_BLOCKLIST_FEATURE_TEST(GL, GPU_FEATURE_TYPE_ACCELERATED_GL)
 
 GPU_BLOCKLIST_FEATURE_TEST(Vulkan, GPU_FEATURE_TYPE_VULKAN)

gpu/config/gpu_feature_type.h

@@ -16,7 +16,6 @@ enum GpuFeatureType {
   GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE,
   GPU_FEATURE_TYPE_GPU_RASTERIZATION,
   GPU_FEATURE_TYPE_ACCELERATED_WEBGL2,
-  GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE,
   GPU_FEATURE_TYPE_OOP_RASTERIZATION,
   GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL,
   GPU_FEATURE_TYPE_ACCELERATED_GL,

gpu/config/gpu_util.cc

@@ -285,17 +285,6 @@ GpuFeatureStatus GetGLFeatureStatus(const std::set<int>& blocklisted_features,
   return kGpuFeatureStatusEnabled;
 }
 
-GpuFeatureStatus GetProtectedVideoDecodeFeatureStatus(
-    const std::set<int>& blocklisted_features,
-    const GPUInfo& gpu_info,
-    bool use_swift_shader) {
-  if (use_swift_shader)
-    return kGpuFeatureStatusDisabled;
-  if (blocklisted_features.count(GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE))
-    return kGpuFeatureStatusBlocklisted;
-  return kGpuFeatureStatusEnabled;
-}
-
 void AppendWorkaroundsToCommandLine(const GpuFeatureInfo& gpu_feature_info,
                                     base::CommandLine* command_line) {
   if (gpu_feature_info.IsWorkaroundEnabled(DISABLE_D3D11)) {
@@ -395,8 +384,6 @@ GpuFeatureInfo ComputeGpuFeatureInfoWithHardwareAccelerationDisabled() {
       kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] =
       kGpuFeatureStatusSoftware;
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE] =
-      kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_OOP_RASTERIZATION] =
       kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL] =
@@ -427,8 +414,6 @@ GpuFeatureInfo ComputeGpuFeatureInfoWithNoGpu() {
       kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] =
       kGpuFeatureStatusDisabled;
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE] =
-      kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_OOP_RASTERIZATION] =
       kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL] =
@@ -459,8 +444,6 @@ GpuFeatureInfo ComputeGpuFeatureInfoForSwiftShader() {
       kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] =
       kGpuFeatureStatusSoftware;
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE] =
-      kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_OOP_RASTERIZATION] =
       kGpuFeatureStatusDisabled;
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL] =
@@ -539,9 +522,6 @@ GpuFeatureInfo ComputeGpuFeatureInfo(const GPUInfo& gpu_info,
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] =
       GetAcceleratedVideoDecodeFeatureStatus(blocklisted_features,
                                              use_swift_shader);
-  gpu_feature_info.status_values[GPU_FEATURE_TYPE_PROTECTED_VIDEO_DECODE] =
-      GetProtectedVideoDecodeFeatureStatus(blocklisted_features, gpu_info,
-                                           use_swift_shader);
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_OOP_RASTERIZATION] =
       GetOopRasterizationFeatureStatus(blocklisted_features, *command_line,
                                        gpu_preferences, gpu_info);

gpu/config/software_rendering_list.json

@@ -1387,99 +1387,6 @@
         "accelerated_webgl"
       ]
     },
-    {
-      "id": 154,
-      "description": "Protected video decoding with swap chain is for certain Intel and AMD GPUs on Windows",
-      "cr_bugs": [1093625],
-      "exceptions": [
-        {
-          "vendor_id": "0x8086",
-          "os": {
-            "type": "win",
-            "version": {
-              "op": ">=",
-              "value": "10"
-            }
-          }
-        },
-        {
-          "vendor_id": "0x1002",
-          "device_id": ["0x15d8"],
-          "device_revision": ["0xe1", "0xe2"],
-          "driver_version": {
-            "op": ">=",
-            "value": "26.20.12055.1000"
-          },
-          "os": {
-            "type": "win",
-            "version": {
-              "op": ">=",
-              "value": "10"
-            }
-          }
-        },
-        {
-          "vendor_id": "0x1002",
-          "device_id": ["0x15d8", "0x15dd"],
-          "device_revision": ["0x93", "0x86"],
-          "driver_version": {
-            "op": ">=",
-            "value": "26.20.15023.6032"
-          },
-          "os": {
-            "type": "win",
-            "version": {
-              "op": ">=",
-              "value": "10"
-            }
-          }
-        },
-        {
-          "vendor_id": "0x1002",
-          "device_id": ["0x15d8", "0x15dd"],
-          "driver_version": {
-            "op": ">=",
-            "value": "27.20.1002.34"
-          },
-          "os": {
-            "type": "win",
-            "version": {
-              "op": ">=",
-              "value": "10"
-            }
-          }
-        }
-      ],
-      "features": [
-        "protected_video_decode"
-      ]
-    },
-    {
-      "id": 155,
-      "description": "Older Intel GPUs cannot support protected video decoding in swap chains",
-      "features": [
-        "protected_video_decode"
-      ],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": ">=",
-          "value": "10.0"
-         }
-      },
-      "vendor_id": "0x8086",
-      "intel_gpu_series": [
-        "sandybridge",
-        "baytrail",
-        "ivybridge",
-        "haswell",
-        "cherrytrail",
-        "broadwell",
-        "apollolake",
-        "skylake",
-        "geminilake"
-      ]
-    },
     {
       "id": 157,
       "description": "VMware can crash with older drivers and WebGL content",