Disable Stage3D when force compositing mode is disabled

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": "6.10",
+  "version": "6.11",
   "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 108 matching lines @@
           }
         }
       ],
       "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"
       ]
     },
     {
       "id": 16,
       "description": "Multisampling is buggy in ATI cards on older MacOSX.",
       "cr_bugs": [67752, 83153],
       "os": {
         "type": "macosx",
         "version": {
@@ skipping 670 matching lines @@
       "description": "Force compositing mode is unstable in Win Vista.",
       "cr_bugs": [170421],
       "os": {
         "type": "win",
         "version": {
           "op": "=",
           "value": "6.0"
         }
       },
       "features": [
+        "flash_3d",
+        "flash_stage3d",
         "force_compositing_mode"
       ]
     },
     {
       "id": 66,
       "description": "Force compositing mode is unstable in MacOSX earlier than 10.8.",
       "cr_bugs": [174101],
       "os": {
         "type": "macosx",
         "version": {
@@ skipping 199 matching lines @@
         "accelerated_video_decode"
       ]
     }
   ]
 }
 
 );  // LONG_STRING_CONST macro
 
 }  // namespace gpu