summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-19 01:02:21 +0000
committerccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-19 01:02:21 +0000
commit220454d186b388088f344890c1cd30a6c6174770 (patch)
treecd619234481b4f131fae94316a6b97e424e4b94d /gpu
parentdf772c31fbca3ee58c3cfde539b751086a20a323 (diff)
downloadchromium_src-220454d186b388088f344890c1cd30a6c6174770.zip
chromium_src-220454d186b388088f344890c1cd30a6c6174770.tar.gz
chromium_src-220454d186b388088f344890c1cd30a6c6174770.tar.bz2
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
Diffstat (limited to 'gpu')
-rw-r--r--gpu/config/software_rendering_list_json.cc33
1 files changed, 17 insertions, 16 deletions
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"
+ ]
}
]
}