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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/gpu/config/software_rendering_list_json.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/gpu/compositor_util.h" 5 #include "content/browser/gpu/compositor_util.h"
6 #include "content/test/content_browser_test.h" 6 #include "content/test/content_browser_test.h"
7 7
8 #if defined(OS_MACOSX) 8 #if defined(OS_MACOSX)
9 #include "base/mac/mac_util.h" 9 #include "base/mac/mac_util.h"
10 #elif defined(OS_WIN) 10 #elif defined(OS_WIN)
(...skipping 11 matching lines...) Expand all
22 DISABLED, 22 DISABLED,
23 ENABLED, 23 ENABLED,
24 THREADED, // Implies FCM 24 THREADED, // Implies FCM
25 DELEGATED, // Implies threaded 25 DELEGATED, // Implies threaded
26 } expected_mode = DISABLED; 26 } expected_mode = DISABLED;
27 #if defined(USE_AURA) 27 #if defined(USE_AURA)
28 expected_mode = DELEGATED; 28 expected_mode = DELEGATED;
29 #elif defined(OS_ANDROID) 29 #elif defined(OS_ANDROID)
30 expected_mode = THREADED; 30 expected_mode = THREADED;
31 #elif defined(OS_MACOSX) 31 #elif defined(OS_MACOSX)
32 expected_mode = THREADED; 32 if (base::mac::IsOSMountainLionOrLater())
33 // Lion has compositing blacklisted when using the Apple software renderer, 33 expected_mode = THREADED;
34 // so results will vary depending if this test is being run in a VM versus
35 // actual hardware.
36 // http://crbug.com/230931
37 if (base::mac::IsOSLion())
38 return;
39 #elif defined(OS_WIN) 34 #elif defined(OS_WIN)
40 if (base::win::GetVersion() >= base::win::VERSION_VISTA) 35 if (base::win::GetVersion() >= base::win::VERSION_VISTA)
41 expected_mode = THREADED; 36 expected_mode = THREADED;
42 #endif 37 #endif
43 38
44 EXPECT_EQ(expected_mode == ENABLED || 39 EXPECT_EQ(expected_mode == ENABLED ||
45 expected_mode == THREADED || 40 expected_mode == THREADED ||
46 expected_mode == DELEGATED, 41 expected_mode == DELEGATED,
47 IsForceCompositingModeEnabled()); 42 IsForceCompositingModeEnabled());
48 EXPECT_EQ(expected_mode == THREADED || 43 EXPECT_EQ(expected_mode == THREADED ||
49 expected_mode == DELEGATED, 44 expected_mode == DELEGATED,
50 IsThreadedCompositingEnabled()); 45 IsThreadedCompositingEnabled());
51 EXPECT_EQ(expected_mode == DELEGATED, 46 EXPECT_EQ(expected_mode == DELEGATED,
52 IsDelegatedRendererEnabled()); 47 IsDelegatedRendererEnabled());
53 } 48 }
54 49
55 } 50 }
OLDNEW
« 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