Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1967)

Unified Diff: trunk/src/content/browser/gpu/compositor_util_browsertest.cc

Issue 75013002: Revert 235626 "Remove blacklisting of Mac OS 10.6 and 10.7." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | trunk/src/gpu/config/software_rendering_list_json.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/browser/gpu/compositor_util_browsertest.cc
===================================================================
--- trunk/src/content/browser/gpu/compositor_util_browsertest.cc (revision 235643)
+++ trunk/src/content/browser/gpu/compositor_util_browsertest.cc (working copy)
@@ -29,13 +29,8 @@
#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;
« no previous file with comments | « no previous file | trunk/src/gpu/config/software_rendering_list_json.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698