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

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

Issue 629913002: Replacing the OVERRIDE with override and FINAL with final in gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Included autogen python file for OVERRIDE Created 6 years, 2 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 | « gpu/config/gpu_control_list_entry_unittest.cc ('k') | gpu/gles2_conform_support/egl/display.h » ('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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 // Release or Debug. 88 // Release or Debug.
89 int32 build_type_; 89 int32 build_type_;
90 }; 90 };
91 91
92 class GPU_EXPORT GPUTestBotConfig : public GPUTestConfig { 92 class GPU_EXPORT GPUTestBotConfig : public GPUTestConfig {
93 public: 93 public:
94 GPUTestBotConfig() { } 94 GPUTestBotConfig() { }
95 virtual ~GPUTestBotConfig(); 95 virtual ~GPUTestBotConfig();
96 96
97 // This should only be called when no gpu_vendor is added. 97 // This should only be called when no gpu_vendor is added.
98 virtual void AddGPUVendor(uint32 gpu_vendor) OVERRIDE; 98 virtual void AddGPUVendor(uint32 gpu_vendor) override;
99 99
100 // Return false if gpu_info does not have valid vendor_id and device_id. 100 // Return false if gpu_info does not have valid vendor_id and device_id.
101 bool SetGPUInfo(const GPUInfo& gpu_info); 101 bool SetGPUInfo(const GPUInfo& gpu_info);
102 102
103 // Check if the bot config is valid, i.e., if it is one valid test-bot 103 // Check if the bot config is valid, i.e., if it is one valid test-bot
104 // environment. For example, if a field is unknown, or if OS is not one 104 // environment. For example, if a field is unknown, or if OS is not one
105 // fully defined OS, then it's valid. 105 // fully defined OS, then it's valid.
106 virtual bool IsValid() const OVERRIDE; 106 virtual bool IsValid() const override;
107 107
108 // Check if a bot config matches a test config, i.e., the test config is a 108 // Check if a bot config matches a test config, i.e., the test config is a
109 // superset of the bot config. 109 // superset of the bot config.
110 bool Matches(const GPUTestConfig& config) const; 110 bool Matches(const GPUTestConfig& config) const;
111 bool Matches(const std::string& config_data) const; 111 bool Matches(const std::string& config_data) const;
112 112
113 // Setup the config with the current gpu testing environment. 113 // Setup the config with the current gpu testing environment.
114 // If gpu_info is NULL, collect GPUInfo first. 114 // If gpu_info is NULL, collect GPUInfo first.
115 bool LoadCurrentConfig(const GPUInfo* gpu_info); 115 bool LoadCurrentConfig(const GPUInfo* gpu_info);
116 116
117 // Check if this bot's config matches |config_data| or any of the |configs|. 117 // Check if this bot's config matches |config_data| or any of the |configs|.
118 static bool CurrentConfigMatches(const std::string& config_data); 118 static bool CurrentConfigMatches(const std::string& config_data);
119 static bool CurrentConfigMatches(const std::vector<std::string>& configs); 119 static bool CurrentConfigMatches(const std::vector<std::string>& configs);
120 120
121 // Check if the bot has blacklisted all GPU features. 121 // Check if the bot has blacklisted all GPU features.
122 static bool GpuBlacklistedOnBot(); 122 static bool GpuBlacklistedOnBot();
123 }; 123 };
124 124
125 } // namespace gpu 125 } // namespace gpu
126 126
127 #endif // GPU_CONFIG_GPU_TEST_CONFIG_H_ 127 #endif // GPU_CONFIG_GPU_TEST_CONFIG_H_
128 128
OLDNEW
« no previous file with comments | « gpu/config/gpu_control_list_entry_unittest.cc ('k') | gpu/gles2_conform_support/egl/display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698