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

Unified Diff: gpu/command_buffer/service/feature_info.h

Issue 23660006: FeatureInfo: Remove allowed_extensions and init workarounds early (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android_webview build Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/context_group_unittest.cc ('k') | gpu/command_buffer/service/feature_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/feature_info.h
diff --git a/gpu/command_buffer/service/feature_info.h b/gpu/command_buffer/service/feature_info.h
index 8b33bb1cead7d301673462990dec89a9dacf9c59..782b3a87e2838d1ae3a64c2c164e133bd0a53212 100644
--- a/gpu/command_buffer/service/feature_info.h
+++ b/gpu/command_buffer/service/feature_info.h
@@ -64,16 +64,15 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
GLint max_cube_map_texture_size;
};
+ // Constructor with workarounds taken from the current process's CommandLine
FeatureInfo();
- // If allowed features = NULL or "*", all features are allowed. Otherwise
- // only features that match the strings in allowed_features are allowed.
- bool Initialize(const char* allowed_features);
- bool Initialize(const DisallowedFeatures& disallowed_features,
- const char* allowed_features);
+ // Constructor with workarounds taken from |command_line|
+ FeatureInfo(const CommandLine& command_line);
- // Turns on certain features if they can be turned on.
- void AddFeatures(const CommandLine& command_line);
+ // Initializes the feature information. Needs a current GL context.
+ bool Initialize();
+ bool Initialize(const DisallowedFeatures& disallowed_features);
const Validators* validators() const {
return &validators_;
@@ -106,6 +105,8 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
~FeatureInfo();
void AddExtensionString(const std::string& str);
+ void InitializeBasicState(const CommandLine& command_line);
+ void InitializeFeatures();
Validators validators_;
« no previous file with comments | « gpu/command_buffer/service/context_group_unittest.cc ('k') | gpu/command_buffer/service/feature_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698