diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 03:58:15 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 03:58:15 +0000 |
| commit | 3164aa6480e48957ceeff0a0ef3da5558f3ce576 (patch) | |
| tree | a89ae094ad6300f0894b8fadb7c9641e1290de4f /content/browser/gpu | |
| parent | 6935e3d51323fad1a2996be6993171e2f4f1f646 (diff) | |
| download | chromium_src-3164aa6480e48957ceeff0a0ef3da5558f3ce576.zip chromium_src-3164aa6480e48957ceeff0a0ef3da5558f3ce576.tar.gz chromium_src-3164aa6480e48957ceeff0a0ef3da5558f3ce576.tar.bz2 | |
Revert 235863 "Remove blacklisting of Mac OS 10.6 and 10.7."
> 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
TBR=ccameron@chromium.org
Review URL: https://codereview.chromium.org/75513004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu')
| -rw-r--r-- | content/browser/gpu/compositor_util_browsertest.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/content/browser/gpu/compositor_util_browsertest.cc b/content/browser/gpu/compositor_util_browsertest.cc index e4bbd70..3bb8eea 100644 --- a/content/browser/gpu/compositor_util_browsertest.cc +++ b/content/browser/gpu/compositor_util_browsertest.cc @@ -29,13 +29,8 @@ IN_PROC_BROWSER_TEST_F(CompositorUtilTest, CompositingModeAsExpected) { #elif defined(OS_ANDROID) expected_mode = THREADED; #elif defined(OS_MACOSX) - expected_mode = THREADED; - // Lion has compositing blacklisted when using the Apple software renderer, - // so results will vary depending if this test is being run in a VM versus - // actual hardware. - // http://crbug.com/230931 - if (base::mac::IsOSLion()) - return; + if (base::mac::IsOSMountainLionOrLater()) + expected_mode = THREADED; #elif defined(OS_WIN) if (base::win::GetVersion() >= base::win::VERSION_VISTA) expected_mode = THREADED; |