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 0f3f7094a68b6645de13b33166dd2c65d90b6d35..004346371e60b1c6b44ac9b442a4a5a8abe3fb33 100644 |
--- a/gpu/command_buffer/service/feature_info.h |
+++ b/gpu/command_buffer/service/feature_info.h |
@@ -110,13 +110,18 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> { |
FeatureInfo(const base::CommandLine& command_line); |
// Initializes the feature information. Needs a current GL context. |
- bool Initialize(); |
- bool Initialize(const DisallowedFeatures& disallowed_features); |
+ bool Initialize(ContextType context_type, |
+ const DisallowedFeatures& disallowed_features); |
+ |
+ // Helper that defaults to no disallowed features and a GLES2 context. |
+ bool InitializeForTesting(); |
const Validators* validators() const { |
return &validators_; |
} |
+ ContextType context_type() const { return context_type_; } |
+ |
const std::string& extensions() const { |
return extensions_; |
} |
@@ -148,6 +153,8 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> { |
workarounds_.use_virtualized_gl_contexts; |
} |
+ bool IsWebGLContext() const; |
+ |
private: |
friend class base::RefCounted<FeatureInfo>; |
friend class BufferManagerClientSideArraysTest; |
@@ -162,6 +169,8 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> { |
DisallowedFeatures disallowed_features_; |
+ ContextType context_type_; |
+ |
// The extensions string returned by glGetString(GL_EXTENSIONS); |
std::string extensions_; |