From 220454d186b388088f344890c1cd30a6c6174770 Mon Sep 17 00:00:00 2001
From: "ccameron@chromium.org"
 <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 19 Nov 2013 01:02:21 +0000
Subject: Remove blacklisting of Mac OS 10.6 and 10.7.

Add blacklisting of VMWare driver on 10.7 because it hangs.

Disable compositing expectation test on 10.7 because it will
give different results depending on whether it is running on
a VM or real hardware.

Expand disabling of PhishingClassifierTest.DisableDetection because it
flakes on all Mac versions now.

TBR=vangelis
BUG=266186

Review URL: https://codereview.chromium.org/62333028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235863 0039d316-1c4b-4281-b951-d872f2087c98
---
 gpu/config/software_rendering_list_json.cc | 33 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'gpu')

diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc
index 502f250..7e51f8d 100644
--- a/gpu/config/software_rendering_list_json.cc
+++ b/gpu/config/software_rendering_list_json.cc
@@ -18,7 +18,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "6.14",
+  "version": "6.15",
   "entries": [
     {
       "id": 1,
@@ -789,21 +789,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
       ]
     },
     {
-      "id": 66,
-      "description": "Force compositing mode is unstable in MacOSX earlier than 10.8.",
-      "cr_bugs": [174101],
-      "os": {
-        "type": "macosx",
-        "version": {
-          "op": "<",
-          "value": "10.8"
-        }
-      },
-      "features": [
-        "force_compositing_mode"
-      ]
-    },
-    {
       "id": 68,
       "description": "VMware Fusion 4 has corrupt rendering with Win Vista+.",
       "cr_bugs": [169470],
@@ -998,6 +983,22 @@ LONG_STRING_CONST(
       "features": [
         "texture_sharing"
       ]
+    },
+    {
+      "id": 81,
+      "description": "Apple software renderer used under VMWare hangs on Mac OS 10.7.",
+      "cr_bugs": [230931],
+      "os": {
+        "type": "macosx",
+        "version": {
+          "op": "=",
+          "value": "10.7"
+        }
+      },
+      "vendor_id": "0x15ad",
+      "features": [
+        "force_compositing_mode"
+      ]
     }
   ]
 }
-- 
cgit v1.1