Roll back the GPU blacklist change we made specifically for M20.

gpu/software_rendering_list/software_rendering_list.json

Index: gpu/software_rendering_list/software_rendering_list.json
===================================================================
--- gpu/software_rendering_list/software_rendering_list.json	(revision 144530)
+++ gpu/software_rendering_list/software_rendering_list.json	(working copy)
@@ -34,7 +34,7 @@
 // 14. "exceptions" is a list of entries.
 // 15. "blacklist" is a list of gpu feature strings, valid values include
 //     "accelerated_2d_canvas", "accelerated_compositing", "webgl",
-//     "multisampling", and "all".
+//     "multisampling", "flash_3d", "flash_stage3d", and "all".
 //     This field is mandatory.
 // 16. "description" has the description of the entry.
 // 17. "webkit_bugs" is an array of associated webkit bug numbers.
@@ -65,7 +65,7 @@
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "1.42",
+  "version": "1.43",
   "entries": [
     {
       "id": 1,
@@ -77,7 +77,9 @@
       "vendor_id": "0x1002",
       "device_id": ["0x7249"],
       "blacklist": [
-        "webgl"
+        "webgl",
+        "flash_3d",
+        "flash_stage3d"
       ]
     },
     {
@@ -104,7 +106,9 @@
       "vendor_id": "0x8086",
       "device_id": ["0x27AE"],
       "blacklist": [
-        "webgl"
+        "webgl",
+        "flash_3d",
+        "flash_stage3d"
       ]
     },
     {
@@ -123,6 +127,7 @@
           },
           "driver_version": {
             "op": ">=",
+            "style": "lexical",
             "number": "8.92"
           }
         }
@@ -154,7 +159,9 @@
       "vendor_id": "0x10de",
       "device_id": ["0x0393"],
       "blacklist": [
-        "webgl"
+        "webgl",
+        "flash_3d",
+        "flash_stage3d"
       ]
     },
     {
@@ -428,6 +435,7 @@
           },
           "driver_version": {
             "op": ">=",
+            "style": "lexical",
             "number": "8.92"
           }
         }
@@ -532,6 +540,40 @@
       ]
     },
     {
+      "id": 35,
+      "description": "Stage3D is not supported on Linux.",
+      "cr_bugs": [129848],
+      "os": {
+        "type": "linux"
+      },
+      "blacklist": [
+        "flash_stage3d"
+      ]
+    },
+    {
+      "id": 36,
+      "description": "Stage3D is not supported on ChromeOS.",
+      "cr_bugs": [129848],
+      "os": {
+        "type": "chromeos"
+      },
+      "blacklist": [
+        "flash_stage3d"
+      ]
+    },
+    {
+      "id": 37,
+      "description": "Drivers are unreliable for Optimus on Linux.",
+      "cr_bugs": [131308],
+      "os": {
+        "type": "linux"
+      },
+      "multi_gpu_style": "optimus",
+      "blacklist": [
+        "all"
+      ]
+    },
+    {
       "id": 38,
       "description": "Accelerated 2D canvas is unstable for NVidia GeForce 9400M on Lion.",
       "cr_bugs": [130495],
@@ -549,6 +591,23 @@
       ]
     },
     {
+      "id": 39,
+      "description": "ATI drivers on Windows XP cause BSODs when using 3D in Flash",
+      "cr_bugs": [130505],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "number": "5"
+        }
+      },
+      "vendor_id": "0x1002",
+      "blacklist": [
+        "flash_3d",
+        "flash_stage3d"
+      ]
+    },
+    {
       "id": 40,
       "description": "GPU driver may cause kernel panic on 2012 Macbook Airs.",
       "cr_bugs": [134015],