OLD | NEW |
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 Loading... |
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 if (base::mac::IsOSMountainLionOrLater()) | 32 expected_mode = THREADED; |
33 expected_mode = THREADED; | 33 // Lion has compositing blacklisted when using the Apple software renderer, |
| 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; |
34 #elif defined(OS_WIN) | 39 #elif defined(OS_WIN) |
35 if (base::win::GetVersion() >= base::win::VERSION_VISTA) | 40 if (base::win::GetVersion() >= base::win::VERSION_VISTA) |
36 expected_mode = THREADED; | 41 expected_mode = THREADED; |
37 #endif | 42 #endif |
38 | 43 |
39 EXPECT_EQ(expected_mode == ENABLED || | 44 EXPECT_EQ(expected_mode == ENABLED || |
40 expected_mode == THREADED || | 45 expected_mode == THREADED || |
41 expected_mode == DELEGATED, | 46 expected_mode == DELEGATED, |
42 IsForceCompositingModeEnabled()); | 47 IsForceCompositingModeEnabled()); |
43 EXPECT_EQ(expected_mode == THREADED || | 48 EXPECT_EQ(expected_mode == THREADED || |
44 expected_mode == DELEGATED, | 49 expected_mode == DELEGATED, |
45 IsThreadedCompositingEnabled()); | 50 IsThreadedCompositingEnabled()); |
46 EXPECT_EQ(expected_mode == DELEGATED, | 51 EXPECT_EQ(expected_mode == DELEGATED, |
47 IsDelegatedRendererEnabled()); | 52 IsDelegatedRendererEnabled()); |
48 } | 53 } |
49 | 54 |
50 } | 55 } |
OLD | NEW |