Improve blacklist logic: use more fields (driver_vendor, gl_renderer, ect) fo...

chrome/browser/resources/gpu_blacklist.json

Index: chrome/browser/resources/gpu_blacklist.json
===================================================================
--- chrome/browser/resources/gpu_blacklist.json	(revision 72173)
+++ chrome/browser/resources/gpu_blacklist.json	(working copy)
@@ -1,8 +1,47 @@
+// Determines whether certain gpu-related features are blacklisted or not.
+// A valid gpu_blacklist.json file are in the format of
+// {
+//   "version": "x.y",
+//   "entries": [
+//     { // entry 1
+//     },
+//     ...
+//     { // entry n
+//     }
+//   ]
+// }
+//
+// Each entry contains the following fields:
+// "os", "vendor_id", "device_id", "driver_version", and "blacklist".
+// Only "blacklist" is mandatory.
+// 1. "os" contains "type" and an optional "version". "type" could be "macosx",
+//    "linux", "win", or "any".  "any" is the same as not specifying "os".
+//    "version" is a VERSION structure (defined below).
+// 2. "vendor_id" has the value of a string.
+// 3. "device_id" has the value of a string.
+// 4. "driver_vendor" is a STRING structure (defined below).
+// 5. "driver_version" is a VERSION structure (defined below).
+// 6. "gl_renderer" is a STRING structure (defined below).
+// 7. "blacklist" is a list of gpu feature strings, valid values include
+//    "accelerated_2d_canvas", "accelerated_compositing", "webgl", and "all".
+//    Currently whatever feature is selected, the effect is the same as "all",
+//    i.e., it's not supported to turn off one GPU feature and not the others.
+//
+// VERSION includes "op" "number", and "number2".  "op" can be any of the
+// following values: "=", "<", "<=", ">", ">=", "any", "between".  "number2" is
+// only used if "op" is "between".  "number" is used for all "op" values except
+// "any". "number" and "number2" are in the format of x, x.x, x.x.x, ect.
+//
+// STRING includes "op" and "value".  "op" can be any of the following values:
+// "contains", "beginwith", "endwith", "=".  "value" is a string.
+
 {
   "name": "gpu blacklist",
-  "version": "0.2",
+  // Please update the version number whenever you change this file.
+  "version": "0.3",
   "entries": [
     { // ATI Radeon X1900 on Mac, BUGWEBKIT=47028
+      "id": "1",
       "os": {
         "type": "macosx"
       },
@@ -12,24 +51,35 @@
         "webgl"
       ]
     },
-    { // Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller, BUG=67345,67939
+    { // Intel cards with Mesa driver earlier than 7.9, BUG=66718,67345,67939
+      "id": "2",
       "os": {
         "type": "linux"
       },
       "vendor_id": "0x8086",
-      "device_id": "0x2a42",
+      "driver_vendor": {
+        "op": "=",
+        "value": "mesa"
+      },
+      "driver_version": {
+        "op": "<",
+        "number": "7.9"
+      },
       "blacklist": [
         "webgl"
       ]
     },
-    { // Intel Corporation Core Processor Integrated Graphics Controller, BUG=66718
+    { // In linux, don't allow GPU compositing if it's software rendering, BUG=59302
+      "id": "3",
       "os": {
         "type": "linux"
       },
-      "vendor_id": "0x8086",
-      "device_id": "0x0046",
+      "gl_renderer": {
+        "op": "contains",
+        "value": "software"
+      },
       "blacklist": [
-        "webgl"
+        "accelerated_compositing"
       ]
     }
   ]