Use RE string pattern matching for blacklist strings.

gpu/config/software_rendering_list_json.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Determines whether certain gpu-related features are blacklisted or not.
 // The format of a valid software_rendering_list.json file is defined in
 // <gpu/config/gpu_control_list_format.txt>.
 // The supported "features" can be found in <gpu/config/gpu_blacklist.cc>.
 
 #include "gpu/config/gpu_control_list_jsons.h"
 
 #define LONG_STRING_CONST(...) #__VA_ARGS__
 
 namespace gpu {
 
 const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
 
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "8.10",
+  "version": "9.0",
   "entries": [
     {
       "id": 1,
       "description": "ATI Radeon X1900 is not compatible with WebGL on the Mac",
       "webkit_bugs": [47028],
       "os": {
         "type": "macosx"
       },
       "vendor_id": "0x1002",
       "device_id": ["0x7249"],
       "features": [
         "webgl",
         "flash_3d",
         "flash_stage3d"
       ]
     },
     {
       "id": 3,
       "description": "GL driver is software rendered. GPU acceleration is disabled",
       "cr_bugs": [59302, 315217],
       "os": {
         "type": "linux"
       },
-      "gl_renderer": {
-        "op": "contains",
-        "value": "software"
-      },
+      "gl_renderer": ".*software.*",
       "features": [
         "all"
       ]
     },
     {
       "id": 4,
       "description": "The Intel Mobile 945 Express family of chipsets is not compatible with WebGL",
       "cr_bugs": [232035],
       "os": {
         "type": "any"
@@ skipping 10 matching lines @@
     {
       "id": 5,
       "description": "ATI/AMD cards with older drivers in Linux are crash-prone",
       "cr_bugs": [71381, 76428, 73910, 101225, 136240, 357314],
       "os": {
         "type": "linux"
       },
       "vendor_id": "0x1002",
       "exceptions": [
         {
-          "driver_vendor": {
-            "op": "contains",
-            "value": "AMD"
-          },
+          "driver_vendor": ".*AMD.*",
           "driver_version": {
             "op": ">=",
             "style": "lexical",
             "value": "8.98"
           }
         },
         {
-          "driver_vendor": {
-            "op": "=",
-            "value": "Mesa"
-          },
+          "driver_vendor": "Mesa",
           "driver_version": {
             "op": ">=",
             "value": "10.0.4"
           }
         }
       ],
       "features": [
         "all"
       ]
     },
@@ skipping 39 matching lines @@
       "exceptions": [
         {
           "vendor_id": "0x8086",
           "device_id": ["0x29a2"],
           "driver_version": {
             "op": ">=",
             "value": "7.15.10.1624"
           }
         },
         {
-          "driver_vendor": {
-            "op": "=",
-            "value": "osmesa"
-          }
+          "driver_vendor": "osmesa"
         },
         {
           "vendor_id": "0x1414",
           "device_id": ["0x02c1"]
         }
       ],
       "features": [
         "all"
       ]
     },
     {
       "id": 17,
       "description": "Older Intel mesa drivers are crash-prone",
       "cr_bugs": [76703, 164555, 225200, 340886],
       "os": {
         "type": "linux"
       },
       "vendor_id": "0x8086",
-      "driver_vendor": {
-        "op": "=",
-        "value": "Mesa"
-      },
+      "driver_vendor": "Mesa",
       "driver_version": {
         "op": "<",
         "value": "10.1"
       },
       "exceptions": [
         {
           "device_id": ["0x0102", "0x0106", "0x0112", "0x0116", "0x0122", "0x0126", "0x010a", "0x0152", "0x0156", "0x015a", "0x0162", "0x0166"],
           "driver_version": {
             "op": ">=",
             "value": "8.0"
@@ skipping 44 matching lines @@
       "features": [
         "all"
       ]
     },
     {
       "id": 23,
       "description": "Mesa drivers in linux older than 7.11 are assumed to be buggy",
       "os": {
         "type": "linux"
       },
-      "driver_vendor": {
-        "op": "=",
-        "value": "Mesa"
-      },
+      "driver_vendor": "Mesa",
       "driver_version": {
         "op": "<",
         "value": "7.11"
       },
       "exceptions": [
         {
-          "driver_vendor": {
-            "op": "=",
-            "value": "osmesa"
-          }
+          "driver_vendor": "osmesa"
         }
       ],
       "features": [
         "all"
       ]
     },
     {
       "id": 24,
       "description": "Accelerated 2d canvas is unstable in Linux at the moment",
       "os": {
         "type": "linux"
       },
       "features": [
         "accelerated_2d_canvas"
       ]
     },
     {
       "id": 27,
       "description": "ATI/AMD cards with older drivers in Linux are crash-prone",
       "cr_bugs": [95934, 94973, 136240, 357314],
       "os": {
         "type": "linux"
       },
-      "gl_vendor": {
-        "op": "beginwith",
-        "value": "ATI"
-      },
+      "gl_vendor": "ATI.*",
       "exceptions": [
         {
-          "driver_vendor": {
-            "op": "contains",
-            "value": "AMD"
-          },
+          "driver_vendor": ".*AMD.*",
           "driver_version": {
             "op": ">=",
             "style": "lexical",
             "value": "8.98"
           }
         },
         {
-          "driver_vendor": {
-            "op": "=",
-            "value": "Mesa"
-          },
+          "driver_vendor": "Mesa",
           "driver_version": {
             "op": ">=",
             "value": "10.0.4"
           }
         }
       ],
       "features": [
         "all"
       ]
     },
     {
       "id": 28,
       "description": "ATI/AMD cards with third-party drivers in Linux are crash-prone",
       "cr_bugs": [95934, 94973, 357314],
       "os": {
         "type": "linux"
       },
-      "gl_vendor": {
-        "op": "beginwith",
-        "value": "X.Org"
-      },
-      "gl_renderer": {
-        "op": "contains",
-        "value": "AMD"
-      },
+      "gl_vendor": "X\\.Org.*",
+      "gl_renderer": ".*AMD.*",
       "exceptions": [
         {
-          "driver_vendor": {
-            "op": "=",
-            "value": "Mesa"
-          },
+          "driver_vendor": "Mesa",
           "driver_version": {
             "op": ">=",
             "value": "10.0.4"
           }
         }
       ],
       "features": [
         "all"
       ]
     },
     {
       "id": 29,
       "description": "ATI/AMD cards with third-party drivers in Linux are crash-prone",
       "cr_bugs": [95934, 94973, 357314],
       "os": {
         "type": "linux"
       },
-      "gl_vendor": {
-        "op": "beginwith",
-        "value": "X.Org"
-      },
-      "gl_renderer": {
-        "op": "contains",
-        "value": "ATI"
-      },
+      "gl_vendor": "X\\.Org.*",
+      "gl_renderer": ".*ATI.*",
       "exceptions": [
         {
-          "driver_vendor": {
-            "op": "=",
-            "value": "Mesa"
-          },
+          "driver_vendor": "Mesa",
           "driver_version": {
             "op": ">=",
             "value": "10.0.4"
           }
         }
       ],
       "features": [
         "all"
       ]
     },
     {
       "id": 30,
       "description": "NVIDIA cards with nouveau drivers in Linux are crash-prone",
       "cr_bugs": [94103],
       "os": {
         "type": "linux"
       },
       "vendor_id": "0x10de",
-      "gl_vendor": {
-        "op": "beginwith",
-        "value": "nouveau"
-      },
+      "gl_vendor": "nouveau.*",
       "features": [
         "all"
       ]
     },
     {
       "id": 32,
       "description": "Accelerated 2d canvas is disabled on Windows systems with low perf stats",
       "cr_bugs": [116350, 151500],
       "os": {
         "type": "win"
       },
       "perf_overall": {
         "op": "<",
         "value": "3.5"
       },
       "exceptions": [
         {
           "perf_gaming": {
             "op": ">",
             "value": "3.5"
           }
         },
         {
-          "cpu_info": {
-            "op": "contains",
-            "value": "Atom"
-          }
+          "cpu_info": ".*Atom.*"
         }
       ],
       "features": [
         "accelerated_2d_canvas"
       ]
     },
     {
       "id": 34,
       "description": "S3 Trio (used in Virtual PC) is not compatible",
       "cr_bugs": [119948],
@@ skipping 20 matching lines @@
     {
       "id": 37,
       "description": "Older drivers are unreliable for Optimus on Linux",
       "cr_bugs": [131308, 363418],
       "os": {
         "type": "linux"
       },
       "multi_gpu_style": "optimus",
       "exceptions": [
         {
-          "driver_vendor": {
-            "op": "=",
-            "value": "Mesa"
-          },
+          "driver_vendor": "Mesa",
           "driver_version": {
             "op": ">=",
             "value": "10.1"
           },
-          "gl_vendor": {
-            "op": "beginwith",
-            "value": "Intel"
-          }
+          "gl_vendor": "Intel.*"
         }
       ],
       "features": [
         "all"
       ]
     },
     {
       "id": 38,
       "description": "Accelerated 2D canvas is unstable for NVidia GeForce 9400M on Lion",
       "cr_bugs": [130495],
@@ skipping 76 matching lines @@
       ]
     },
     {
       "id": 47,
       "description": "NVIDIA linux drivers older than 295.* are assumed to be buggy",
       "cr_bugs": [78497],
       "os": {
         "type": "linux"
       },
       "vendor_id": "0x10de",
-      "driver_vendor": {
-        "op": "=",
-        "value": "NVIDIA"
-      },
+      "driver_vendor": "NVIDIA",
       "driver_version": {
         "op": "<",
         "value": "295"
       },
       "features": [
         "all"
       ]
     },
     {
       "id": 48,
@@ skipping 40 matching lines @@
         "flash_stage3d"
       ]
     },
     {
       "id": 50,
       "description": "Disable VMware software renderer on older Mesa",
       "cr_bugs": [145531, 332596],
       "os": {
         "type": "linux"
       },
-      "gl_vendor": {
-        "op": "beginwith",
-        "value": "VMware"
-      },
+      "gl_vendor": "VMware.*",
       "exceptions": [
         {
-          "driver_vendor": {
-            "op": "=",
-            "value": "Mesa"
-          },
+          "driver_vendor": "Mesa",
           "driver_version": {
             "op": ">=",
             "value": "9.2.1"
           },
-          "gl_renderer": {
-            "op": "contains",
-            "value": "SVGA3D"
-          }
+          "gl_renderer": ".*SVGA3D.*"
         }
       ],
       "features": [
         "all"
       ]
     },
     {
       "id": 53,
       "description": "The Intel GMA500 is too slow for Stage3D",
       "cr_bugs": [152096],
       "vendor_id": "0x8086",
       "device_id": ["0x8108", "0x8109"],
       "features": [
         "flash_stage3d"
       ]
     },
     {
       "id": 56,
       "description": "NVIDIA linux drivers are unstable when using multiple Open GL contexts and with low memory",
       "cr_bugs": [145600],
       "os": {
         "type": "linux"
       },
       "vendor_id": "0x10de",
-      "driver_vendor": {
-        "op": "=",
-        "value": "NVIDIA"
-      },
+      "driver_vendor": "NVIDIA",
       "features": [
         "accelerated_video_decode",
         "flash_3d",
         "flash_stage3d"
       ]
     },
     {
       // Panel fitting is only used with OS_CHROMEOS. To avoid displaying an
       // error in chrome:gpu on every other platform, this blacklist entry needs
       // to only match on chromeos. The drawback is that panel_fitting will not
@@ skipping 29 matching lines @@
         "accelerated_video_decode"
       ]
     },
     {
       "id": 62,
       "description": "Accelerated 2D canvas buggy on old Qualcomm Adreno",
       "cr_bugs": [161575],
       "os": {
         "type": "android"
       },
-      "gl_renderer": {
-        "op": "contains",
-        "value": "Adreno"
-      },
+      "gl_renderer": ".*Adreno.*",
       "driver_version": {
         "op": "<",
         "value": "4.1"
       },
       "features": [
         "accelerated_2d_canvas"
       ]
     },
     {
       "id": 64,
@@ skipping 108 matching lines @@
         "webgl"
       ]
     },
     {
       "id": 74,
       "description": "GPU access is blocked if users don't have proper graphics driver installed after Windows installation",
       "cr_bugs": [248178],
       "os": {
         "type": "win"
       },
-      "driver_vendor": {
-        "op": "=",
-        "value": "Microsoft"
-      },
+      "driver_vendor": "Microsoft",
       "exceptions": [
         {
           "vendor_id": "0x1414",
           "device_id": ["0x02c1"]
         }
       ],
       "features": [
         "all"
       ]
     },
@@ skipping 240 matching lines @@
       ]
     },
     {
       "id": 95,
       "description": "AMD driver version 13.101 is unstable on linux.",
       "cr_bugs": [363378],
       "os": {
         "type": "linux"
       },
       "vendor_id": "0x1002",
-      "driver_vendor": {
-        "op": "contains",
-        "value": "AMD"
-      },
+      "driver_vendor": ".*AMD.*",
       "driver_version": {
         "op": "=",
         "value": "13.101"
       },
       "features": [
         "all"
       ]
     },
     {
       "id": 96,
@@ skipping 62 matching lines @@
       "features": [
         "gpu_rasterization_expanded_heuristics"
       ]
     }
   ]
 }
 
 );  // LONG_STRING_CONST macro
 
 }  // namespace gpu