Clean up windows XP/Vista blacklist entry.

1) Consolidate WinXP and Vista blacklist entries
2) Get rid of 2007-2009 driver range for supported Windows

This is mostly relanding jbaumann's CL:
https://codereview.chromium.org/58343007

Plus adding an exception for bots (using "osmesa")

BUG=315199,315205
TEST=bots
R=jbauman@chromium.org, kbr@chromium.org

Review URL: https://codereview.chromium.org/63143002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233401 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 180 deletions

diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc
index e3641ca..502f250 100644
--- a/gpu/config/software_rendering_list_json.cc
+++ b/gpu/config/software_rendering_list_json.cc
@@ -18,7 +18,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "6.13",
+  "version": "6.14",
   "entries": [
     {
       "id": 1,
@@ -122,7 +122,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
     {
       "id": 12,
       "description": "Drivers older than 2009-01 on Windows are possibly unreliable.",
-      "cr_bugs": [72979, 89802],
+      "cr_bugs": [72979, 89802, 315205],
       "os": {
         "type": "win"
       },
@@ -147,92 +147,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
         }
       ],
       "features": [
-        "accelerated_2d_canvas",
-        "accelerated_video",
-        "accelerated_video_decode",
-        "3d_css",
-        "multisampling",
-        "flash_3d",
-        "flash_stage3d",
-        "force_compositing_mode"
-      ]
-    },
-    {
-      "id": 13,
-      "description": "ATI drivers older than 10.6 on Windows XP are possibly unreliable.",
-      "cr_bugs": [74212],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": "=",
-          "value": "5"
-        }
-      },
-      "vendor_id": "0x1002",
-      "driver_version": {
-        "op": "<",
-        "value": "8.741"
-      },
-      "features": [
-        "accelerated_video",
-        "accelerated_video_decode",
-        "3d_css",
-        "multisampling",
-        "flash_3d",
-        "flash_stage3d",
-        "force_compositing_mode"
-      ]
-    },
-    {
-      "id": 14,
-      "description": "NVIDIA drivers older than 257.21 on Windows XP are possibly unreliable.",
-      "cr_bugs": [74212],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": "=",
-          "value": "5"
-        }
-      },
-      "vendor_id": "0x10de",
-      "driver_version": {
-        "op": "<",
-        "value": "6.14.12.5721"
-      },
-      "features": [
-        "accelerated_video",
-        "accelerated_video_decode",
-        "3d_css",
-        "multisampling",
-        "flash_3d",
-        "flash_stage3d",
-        "force_compositing_mode"
-      ]
-    },
-    {
-      "id": 15,
-      "description": "Intel drivers older than 14.42.7.5294 on Windows XP are possibly unreliable.",
-      "cr_bugs": [74212],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": "=",
-          "value": "5"
-        }
-      },
-      "vendor_id": "0x8086",
-      "driver_version": {
-        "op": "<",
-        "value": "6.14.10.5294"
-      },
-      "features": [
-        "accelerated_video",
-        "accelerated_video_decode",
-        "3d_css",
-        "multisampling",
-        "flash_3d",
-        "flash_stage3d",
-        "force_compositing_mode"
+        "all"
       ]
     },
     {
@@ -535,21 +450,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       ]
     },
     {
-      "id": 41,
-      "description": "Disable 3D (but not Stage3D) in Flash on XP",
-      "cr_bugs": [134885],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": "=",
-          "value": "5"
-        }
-      },
-      "features": [
-        "flash_3d"
-      ]
-    },
-    {
       "id": 42,
       "description": "AMD Radeon HD 6490M and 6970M on Snow Leopard are buggy.",
       "cr_bugs": [137307, 285350],
@@ -711,46 +611,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       ]
     },
     {
-      "id": 51,
-      "description": "NVIDIA drivers 6.14.11.9621 is buggy on Windows XP.",
-      "cr_bugs": [152096],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": "=",
-          "value": "5"
-        }
-      },
-      "vendor_id": "0x10de",
-      "driver_version": {
-        "op": "=",
-        "value": "6.14.11.9621"
-      },
-      "features": [
-        "all"
-      ]
-    },
-    {
-      "id": 52,
-      "description": "NVIDIA drivers 6.14.11.8267 is buggy on Windows XP.",
-      "cr_bugs": [152096],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": "=",
-          "value": "5"
-        }
-      },
-      "vendor_id": "0x10de",
-      "driver_version": {
-        "op": "=",
-        "value": "6.14.11.8267"
-      },
-      "features": [
-        "all"
-      ]
-    },
-    {
       "id": 53,
       "description": "The Intel GMA500 is too slow for Stage3D.",
       "cr_bugs": [152096],
@@ -944,21 +804,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       ]
     },
     {
-      "id": 67,
-      "description": "Accelerated 2D Canvas is not supported on WinXP.",
-      "cr_bugs": [175149],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": "=",
-          "value": "5"
-        }
-      },
-      "features": [
-        "accelerated_2d_canvas"
-      ]
-    },
-    {
       "id": 68,
       "description": "VMware Fusion 4 has corrupt rendering with Win Vista+.",
       "cr_bugs": [169470],
@@ -1104,23 +949,6 @@ LONG_STRING_CONST(
       ]
     },
     {
-      "id": 77,
-      "description": "Multisampling is reportedly very slow on Quadro NVS 135M/GeForce 8400M GS",
-      "cr_bugs": [279446],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": "=",
-          "value": "5"
-        }
-      },
-      "vendor_id": "0x10de",
-      "device_id": ["0x0429", "0x042b"],
-      "features": [
-        "multisampling"
-      ]
-    },
-    {
       "id": 78,
       "description": "Accelerated video decode interferes with GPU sandbox on older Intel drivers",
       "cr_bugs": [180695],
@@ -1139,8 +967,8 @@ LONG_STRING_CONST(
     },
     {
       "id": 79,
-      "description": "Disable force compositing mode on all Windows versions prior to and including Vista.",
-      "cr_bugs": [273920, 170421],
+      "description": "Disable GPU on all Windows versions prior to and including Vista.",
+      "cr_bugs": [315199],
       "os": {
         "type": "win",
         "version": {
@@ -1148,10 +976,16 @@ LONG_STRING_CONST(
           "value": "6.0"
         }
       },
+      "exceptions": [
+        {
+          "driver_vendor": {
+            "op": "=",
+            "value": "osmesa"
+          }
+        }
+      ],
       "features": [
-        "flash_3d",
-        "flash_stage3d",
-        "force_compositing_mode"
+        "all"
       ]
     },
     {