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

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

Issue 2172693002: Fix GPUTestConfigTest.LoadCurrentConfig on macOS Sierra. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | gpu/config/gpu_test_config.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 (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 #ifndef GPU_CONFIG_GPU_TEST_CONFIG_H_ 5 #ifndef GPU_CONFIG_GPU_TEST_CONFIG_H_
6 #define GPU_CONFIG_GPU_TEST_CONFIG_H_ 6 #define GPU_CONFIG_GPU_TEST_CONFIG_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 14 matching lines...) Expand all
25 kOsWinVista = 1 << 1, 25 kOsWinVista = 1 << 1,
26 kOsWin7 = 1 << 2, 26 kOsWin7 = 1 << 2,
27 kOsWin8 = 1 << 3, 27 kOsWin8 = 1 << 3,
28 kOsMacLeopard = 1 << 4, 28 kOsMacLeopard = 1 << 4,
29 kOsMacSnowLeopard = 1 << 5, 29 kOsMacSnowLeopard = 1 << 5,
30 kOsMacLion = 1 << 6, 30 kOsMacLion = 1 << 6,
31 kOsMacMountainLion = 1 << 7, 31 kOsMacMountainLion = 1 << 7,
32 kOsMacMavericks = 1 << 8, 32 kOsMacMavericks = 1 << 8,
33 kOsMacYosemite = 1 << 9, 33 kOsMacYosemite = 1 << 9,
34 kOsMacElCapitan = 1 << 10, 34 kOsMacElCapitan = 1 << 10,
35 kOsMacSierra = 1 << 11,
35 kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion | 36 kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion |
36 kOsMacMountainLion | kOsMacMavericks | kOsMacYosemite | 37 kOsMacMountainLion | kOsMacMavericks | kOsMacYosemite |
37 kOsMacElCapitan, 38 kOsMacElCapitan | kOsMacSierra,
38 kOsLinux = 1 << 11, 39 kOsLinux = 1 << 12,
39 kOsChromeOS = 1 << 12, 40 kOsChromeOS = 1 << 13,
40 kOsAndroid = 1 << 13, 41 kOsAndroid = 1 << 14,
41 kOsWin10 = 1 << 14, 42 kOsWin10 = 1 << 15,
42 kOsWin = kOsWinXP | kOsWinVista | kOsWin7 | kOsWin8 | kOsWin10, 43 kOsWin = kOsWinXP | kOsWinVista | kOsWin7 | kOsWin8 | kOsWin10,
43 }; 44 };
44 45
45 enum BuildType { 46 enum BuildType {
46 kBuildTypeUnknown = 0, 47 kBuildTypeUnknown = 0,
47 kBuildTypeRelease = 1 << 0, 48 kBuildTypeRelease = 1 << 0,
48 kBuildTypeDebug = 1 << 1, 49 kBuildTypeDebug = 1 << 1,
49 }; 50 };
50 51
51 enum API { 52 enum API {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 static bool CurrentConfigMatches(const std::vector<std::string>& configs); 139 static bool CurrentConfigMatches(const std::vector<std::string>& configs);
139 140
140 // Check if the bot has blacklisted all GPU features. 141 // Check if the bot has blacklisted all GPU features.
141 static bool GpuBlacklistedOnBot(); 142 static bool GpuBlacklistedOnBot();
142 }; 143 };
143 144
144 } // namespace gpu 145 } // namespace gpu
145 146
146 #endif // GPU_CONFIG_GPU_TEST_CONFIG_H_ 147 #endif // GPU_CONFIG_GPU_TEST_CONFIG_H_
147 148
OLDNEW
« no previous file with comments | « no previous file | gpu/config/gpu_test_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698