Index: Source/core/html/canvas/WebGLRenderingContextBase.h |
diff --git a/Source/core/html/canvas/WebGLRenderingContextBase.h b/Source/core/html/canvas/WebGLRenderingContextBase.h |
index 869d099e39fffe3bf138049b67c30696f4f39fe2..8b525cc81c1ee8e2b7a9a774e67b9b2d15dd21bb 100644 |
--- a/Source/core/html/canvas/WebGLRenderingContextBase.h |
+++ b/Source/core/html/canvas/WebGLRenderingContextBase.h |
@@ -532,10 +532,10 @@ protected: |
OwnPtr<Extensions3DUtil> m_extensionsUtil; |
enum ExtensionFlags { |
- ApprovedExtension = 0x00, |
- DraftExtension = 0x01, |
- PrivilegedExtension = 0x02, |
- PrefixedExtension = 0x04, |
+ ApprovedExtension = 0x00, |
+ DraftExtension = 0x01, // Extension that is behind the draft extensions runtime flag. |
+ PrivilegedExtension = 0x02, |
+ EnabledDraftExtension = 0x04, // Extension that is still in draft state, but has been selectively enabled by default. |
Ken Russell (switch to Gerrit)
2014/03/25 18:21:11
Please update this comment to say something like
|
WebGLDebugRendererInfoExtension = 0x08, |
}; |
@@ -544,7 +544,6 @@ protected: |
ExtensionTracker(ExtensionFlags flags, const char* const* prefixes) |
: m_privileged(flags & PrivilegedExtension) |
, m_draft(flags & DraftExtension) |
- , m_prefixed(flags & PrefixedExtension) |
, m_webglDebugRendererInfo(flags & WebGLDebugRendererInfoExtension) |
, m_prefixes(prefixes) |
{ |
@@ -554,11 +553,6 @@ protected: |
{ |
} |
- bool prefixed() const |
- { |
- return m_prefixed; |
- } |
- |
bool privileged() const |
{ |
return m_privileged; |
@@ -574,6 +568,7 @@ protected: |
return m_webglDebugRendererInfo; |
} |
+ const char* const* prefixes() const; |
bool matchesNameWithPrefixes(const String&) const; |
virtual PassRefPtr<WebGLExtension> getExtension(WebGLRenderingContextBase*) = 0; |
@@ -584,7 +579,6 @@ protected: |
private: |
bool m_privileged; |
bool m_draft; |
- bool m_prefixed; |
bool m_webglDebugRendererInfo; |
const char* const* m_prefixes; |
}; |
@@ -652,6 +646,8 @@ protected: |
m_extensions.append(new TypedExtensionTracker<T>(extensionPtr, flags, prefixes)); |
} |
+ bool extensionSupportedAndAllowed(const ExtensionTracker*); |
+ |
inline bool extensionEnabled(WebGLExtensionName name) |
{ |
return m_extensionEnabled[name]; |