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

Side by Side Diff: trunk/src/content/browser/gpu/compositor_util_browsertest.cc

Issue 388973002: Revert 282672 "Revert 281692 "Mac: Enable delegated renderer by ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 months 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
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/public/test/content_browser_test.h" 6 #include "content/public/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 = DELEGATED; 30 expected_mode = DELEGATED;
31 #elif defined(OS_MACOSX) 31 #elif defined(OS_MACOSX)
32 expected_mode = THREADED; 32 expected_mode = DELEGATED;
33 // Lion and SnowLeopard have compositing blacklisted when using the Apple 33 // Lion and SnowLeopard have compositing blacklisted when using the Apple
34 // software renderer, so results will vary depending if this test is being 34 // software renderer, so results will vary depending if this test is being
35 // run in a VM versus actual hardware. 35 // run in a VM versus actual hardware.
36 // http://crbug.com/230931 36 // http://crbug.com/230931
37 if (base::mac::IsOSLionOrEarlier()) 37 if (base::mac::IsOSLionOrEarlier())
38 return; 38 return;
39 #elif defined(OS_WIN) 39 #elif defined(OS_WIN)
40 if (base::win::GetVersion() >= base::win::VERSION_VISTA) 40 if (base::win::GetVersion() >= base::win::VERSION_VISTA)
41 expected_mode = THREADED; 41 expected_mode = THREADED;
42 #endif 42 #endif
43 43
44 EXPECT_EQ(expected_mode == THREADED || 44 EXPECT_EQ(expected_mode == THREADED ||
45 expected_mode == DELEGATED, 45 expected_mode == DELEGATED,
46 IsThreadedCompositingEnabled()); 46 IsThreadedCompositingEnabled());
47 EXPECT_EQ(expected_mode == DELEGATED, 47 EXPECT_EQ(expected_mode == DELEGATED,
48 IsDelegatedRendererEnabled()); 48 IsDelegatedRendererEnabled());
49 } 49 }
50 50
51 } 51 }
OLDNEW
« no previous file with comments | « trunk/src/content/browser/gpu/compositor_util.cc ('k') | trunk/src/content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698