Unify GPU raster and accelerated canvas blacklists on Android.

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": "9.16",
+  "version": "9.17",
   "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"],
@@ skipping 582 matching lines @@
       "vendor_id": "0x10de",
       "driver_version": {
         "op": "=",
         "value": "8.15.11.8593"
       },
       "features": [
         "accelerated_video_decode"
       ]
     },
     {
-      "id": 62,
-      "description": "Accelerated 2D canvas buggy on old Qualcomm Adreno",
-      "cr_bugs": [161575],
-      "os": {
-        "type": "android"
-      },
-      "gl_renderer": ".*Adreno.*",
-      "driver_version": {
-        "op": "<",
-        "value": "4.1"
-      },
-      "features": [
-        "accelerated_2d_canvas"
-      ]
-    },
-    {
       "id": 64,
       "description": "Hardware video decode is only supported in win7+",
       "cr_bugs": [159458],
       "os": {
         "type": "win",
         "version": {
           "op": "<",
           "value": "6.1"
         }
       },
@@ skipping 378 matching lines @@
       "driver_version": {
         "op": "=",
         "value": "13.101"
       },
       "features": [
         "all"
       ]
     },
     {
       "id": 96,
-      "description": "GPU rasterization whitelist",
+      "description": "Blacklist GPU raster/canvas on all except known good GPUs and newer Android releases",
       "cr_bugs": [362779,424970],
       "os": {
         "type": "android"
       },
       "exceptions": [
         {
           "os": {
             "type": "android"
           },
           "gl_renderer": "Adreno (TM) 3.*"
@@ skipping 34 matching lines @@
             }
           },
           "gl_type": "gles",
           "gl_version": {
             "op": ">=",
             "value": "3.0"
           }
         }
       ],
       "features": [
-        "gpu_rasterization"
+        "gpu_rasterization",
+        "accelerated_2d_canvas"
       ]
     },
     {
       "id": 99,
       "description": "GPU rasterization is blacklisted on non-Android",
       "cr_bugs": [362779],
       "exceptions": [
         {
           "os": {
             "type": "android"
           }
         }
       ],
       "features": [
         "gpu_rasterization"
       ]
     },
     {
       "id": 100,
       "description": "GPU rasterization is blacklisted on Nexus 10",

[Zhenyao Mo, 2015/01/29 22:42:50]

rasterization "and canvas"

[aelias_OOO_until_Jul13, 2015/01/29 22:44:27]

Done.

       "cr_bugs": [407144],
       "gl_renderer": ".*Mali-T604.*",
       "features": [
-        "gpu_rasterization"
+        "gpu_rasterization",
+        "accelerated_2d_canvas"
       ]
     },
     {
       "id": 101,
       "description": "Samsung Galaxy Tab is too buggy to use for video decoding",
       "cr_bugs": [408353],
       "os": {
         "type": "android",
         "version": {
           "op": "<",
@@ skipping 51 matching lines @@
         "accelerated_2d_canvas",
         "gpu_rasterization"
       ]
     }
   ]
 }
 
 );  // LONG_STRING_CONST macro
 
 }  // namespace gpu