Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/sys_info.h" | 8 #include "base/sys_info.h" |
| 9 #include "gpu/config/gpu_info.h" | 9 #include "gpu/config/gpu_info.h" |
| 10 #include "gpu/config/gpu_info_collector.h" | 10 #include "gpu/config/gpu_info_collector.h" |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 267 return false; | 267 return false; |
| 268 for (size_t i = 0 ; i < configs.size(); ++i) { | 268 for (size_t i = 0 ; i < configs.size(); ++i) { |
| 269 if (my_config.Matches(configs[i])) | 269 if (my_config.Matches(configs[i])) |
| 270 return true; | 270 return true; |
| 271 } | 271 } |
| 272 return false; | 272 return false; |
| 273 } | 273 } |
| 274 | 274 |
| 275 // static | 275 // static |
| 276 bool GPUTestBotConfig::GpuBlacklistedOnBot() { | 276 bool GPUTestBotConfig::GpuBlacklistedOnBot() { |
| 277 #if defined(OS_WIN) | |
| 278 // Blacklist rule #79 disables all Gpu acceleration before Windows 7. | |
| 279 if (base::win::GetVersion() <= base::win::VERSION_VISTA) { | |
| 280 return false; | |
| 281 } | |
| 282 #endif | |
| 277 #if defined(OS_MACOSX) | 283 #if defined(OS_MACOSX) |
|
Zhenyao Mo
2014/01/08 19:12:11
nit: this should be elif
ccameron
2014/01/08 19:44:14
Done.
| |
| 278 // Blacklist rule #81 disables all Gpu acceleration on Mac < 10.8 bots. | 284 // Blacklist rule #81 disables all Gpu acceleration on Mac < 10.8 bots. |
| 279 if (CurrentConfigMatches("MAC VMWARE") && base::mac::IsOSLionOrEarlier()) { | 285 if (CurrentConfigMatches("MAC VMWARE") && base::mac::IsOSLionOrEarlier()) { |
| 280 return true; | 286 return true; |
| 281 } | 287 } |
| 282 #endif | 288 #endif |
| 283 // TODO(ccameron): This should be true on Windows XP as well. | |
| 284 return false; | 289 return false; |
| 285 } | 290 } |
| 286 | 291 |
| 287 } // namespace gpu | 292 } // namespace gpu |
| 288 | 293 |
| OLD | NEW |