Merge 161150 - Blacklist video and flash acceleration on NVIDIA Linux drivers.

content/browser/gpu/software_rendering_list.json

Index: content/browser/gpu/software_rendering_list.json
===================================================================
--- content/browser/gpu/software_rendering_list.json	(revision 162844)
+++ content/browser/gpu/software_rendering_list.json	(working copy)
@@ -69,7 +69,7 @@
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "3.6",
+  "version": "3.7",
   "entries": [
     {
       "id": 1,
@@ -781,6 +781,25 @@
       "blacklist": [
         "all"
       ]
+    },
+    {
+      "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"
+      },
+      "blacklist": [
+        "accelerated_video",
+        "accelerated_video_decode",
+        "flash_3d",
+        "flash_stage3d"
+      ]
     }
   ]
 }