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

Side by Side Diff: gpu/config/gpu_test_config.cc

Issue 1917973002: mac: Remove IsOSLion(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tapted Created 4 years, 7 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
« no previous file with comments | « device/bluetooth/bluetooth_adapter_factory.cc ('k') | media/base/mac/avfoundation_glue.mm » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "gpu/config/gpu_test_config.h" 5 #include "gpu/config/gpu_test_config.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/sys_info.h" 11 #include "base/sys_info.h"
12 #include "gpu/config/gpu_info.h" 12 #include "gpu/config/gpu_info.h"
13 #include "gpu/config/gpu_info_collector.h" 13 #include "gpu/config/gpu_info_collector.h"
14 #include "gpu/config/gpu_test_expectations_parser.h" 14 #include "gpu/config/gpu_test_expectations_parser.h"
15 15
16 #if defined(OS_MACOSX) 16 #if defined(OS_WIN)
17 #include "base/mac/mac_util.h"
18 #elif defined(OS_WIN)
19 #include "base/win/windows_version.h" 17 #include "base/win/windows_version.h"
20 #endif 18 #endif
21 19
22 namespace gpu { 20 namespace gpu {
23 21
24 namespace { 22 namespace {
25 23
26 GPUTestConfig::OS GetCurrentOS() { 24 GPUTestConfig::OS GetCurrentOS() {
27 #if defined(OS_CHROMEOS) 25 #if defined(OS_CHROMEOS)
28 return GPUTestConfig::kOsChromeOS; 26 return GPUTestConfig::kOsChromeOS;
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 return false; 293 return false;
296 for (size_t i = 0 ; i < configs.size(); ++i) { 294 for (size_t i = 0 ; i < configs.size(); ++i) {
297 if (my_config.Matches(configs[i])) 295 if (my_config.Matches(configs[i]))
298 return true; 296 return true;
299 } 297 }
300 return false; 298 return false;
301 } 299 }
302 300
303 // static 301 // static
304 bool GPUTestBotConfig::GpuBlacklistedOnBot() { 302 bool GPUTestBotConfig::GpuBlacklistedOnBot() {
305 #if defined(OS_MACOSX) 303 #if defined(OS_WIN)
306 // Blacklist rule #81 disables all Gpu acceleration on Mac < 10.8 bots.
307 if (CurrentConfigMatches("MAC VMWARE") && base::mac::IsOSLionOrEarlier()) {
308 return true;
309 }
310 #elif defined(OS_WIN)
311 // Blacklist rule #79 disables all Gpu acceleration before Windows 7. 304 // Blacklist rule #79 disables all Gpu acceleration before Windows 7.
312 if (base::win::GetVersion() <= base::win::VERSION_VISTA) { 305 if (base::win::GetVersion() <= base::win::VERSION_VISTA) {
313 return true; 306 return true;
314 } 307 }
315 #endif 308 #endif
316 return false; 309 return false;
317 } 310 }
318 311
319 } // namespace gpu 312 } // namespace gpu
320 313
OLDNEW
« no previous file with comments | « device/bluetooth/bluetooth_adapter_factory.cc ('k') | media/base/mac/avfoundation_glue.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698