Revert 228401 "Enable GPU control lists in tests."

trunk/src/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.12",
+  "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 99 matching lines @@
         "value": "2009.1"
       },
       "exceptions": [
         {
           "vendor_id": "0x8086",
           "device_id": ["0x29a2"],
           "driver_version": {
             "op": ">=",
             "value": "7.15.10.1624"
           }
-        },
-        {
-          "driver_vendor": {
-            "op": "=",
-            "value": "osmesa"
-          }
         }
       ],
       "features": [
         "accelerated_2d_canvas",
         "accelerated_video",
         "accelerated_video_decode",
         "3d_css",
         "multisampling",
         "flash_3d",
         "flash_stage3d",
@@ skipping 171 matching lines @@
         "type": "linux"
       },
       "driver_vendor": {
         "op": "=",
         "value": "Mesa"
       },
       "driver_version": {
         "op": "<",
         "value": "7.11"
       },
-      "exceptions": [
-        {
-          "driver_vendor": {
-            "op": "=",
-            "value": "osmesa"
-          }
-        }
-      ],
       "features": [
         "all"
       ]
     },
     {
       "id": 24,
       "description": "Accelerated 2d canvas is unstable in Linux at the moment.",
       "os": {
         "type": "linux"
       },
@@ skipping 417 matching lines @@
         "value": "2007.1"
       },
       "exceptions": [
         {
           "vendor_id": "0x8086",
           "device_id": ["0x29a2"],
           "driver_version": {
             "op": ">=",
             "value": "7.15.10.1624"
           }
-        },
-        {
-          "driver_vendor": {
-            "op": "=",
-            "value": "osmesa"
-          }
         }
       ],
       "features": [
         "all"
       ]
     },
     {
       "id": 56,
       "description": "NVIDIA linux drivers are unstable when using multiple Open GL contexts and with low memory.",
       "cr_bugs": [145600],
@@ skipping 283 matching lines @@
         "type": "win"
       },
       "driver_vendor": {
         "op": "=",
         "value": "Microsoft"
       },
       "features": [
         "all"
       ]
     },
-)  // String split to avoid MSVC char limit.
-LONG_STRING_CONST(
     {
       "id": 75,
       "description": "Texture sharing not supported on AMD Switchable GPUs due to driver issues",
       "cr_bugs": [117371],
       "os": {
         "type": "win"
       },
       "multi_gpu_style": "amd_switchable",
       "features": [
         "texture_sharing"
       ]
     },
+)  // String split to avoid MSVC char limit.
+LONG_STRING_CONST(
     {
       "id": 76,
       "description": "WebGL is disabled on Android unless GPU reset notification is supported",
       "os": {
         "type": "android"
       },
       "exceptions": [
         {
           "gl_reset_notification_strategy": {
             "op": "=",
@@ skipping 31 matching lines @@
       },
       "vendor_id": "0x8086",
       "driver_version": {
         "op": "between",
         "value": "8.15.10.1883",
         "value2": "8.15.10.2702"
       },
       "features": [
         "accelerated_video_decode"
       ]
-    },
-    {
-      "id": 79,
-      "description": "Disable force compositing mode on all Windows versions prior to Vista.",
-      "cr_bugs": [273920],
-      "os": {
-        "type": "win",
-        "version": {
-          "op": "<",
-          "value": "6.0"
-        }
-      },
-      "features": [
-        "force_compositing_mode"
-      ]
     }
   ]
 }
 
 );  // LONG_STRING_CONST macro
 
 }  // namespace gpu
+