WebGL: Return both unprefixed and prefixed supported names from getSupportedExtensions

Source/core/html/canvas/WebGLRenderingContextBase.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 2081 matching lines @@
         m_lostContextErrors.remove(0);
         return err;
     }
 
     if (isContextLost())
         return GL_NO_ERROR;
 
     return m_context->getError();
 }
 
+const char* const* WebGLRenderingContextBase::ExtensionTracker::prefixes() const
+{
+    static const char* const unprefixed[] = { "", 0, };
+    return m_prefixes ? m_prefixes : unprefixed;
+}
+
 bool WebGLRenderingContextBase::ExtensionTracker::matchesNameWithPrefixes(const String& name) const
 {
-    static const char* const unprefixed[] = { "", 0, };
-
-    const char* const* prefixes = m_prefixes ? m_prefixes : unprefixed;
-    for (; *prefixes; ++prefixes) {
-        String prefixedName = String(*prefixes) + extensionName();
+    const char* const* prefixSet = prefixes();
+    for (; *prefixSet; ++prefixSet) {
+        String prefixedName = String(*prefixSet) + extensionName();
         if (equalIgnoringCase(prefixedName, name)) {
             return true;
         }
     }
     return false;
 }
 
+bool WebGLRenderingContextBase::extensionSupportedAndAllowed(const ExtensionTracker* tracker)
+{
+    if (tracker->webglDebugRendererInfo() && !allowWebGLDebugRendererInfo())
+        return false;
+    if (tracker->privileged() && !allowPrivilegedExtensions())
+        return false;
+    if (tracker->draft() && !RuntimeEnabledFeatures::webGLDraftExtensionsEnabled())
+        return false;
+    if (!tracker->supported(this))
+        return false;
+    return true;
+}
+
+
 PassRefPtr<WebGLExtension> WebGLRenderingContextBase::getExtension(const String& name)
 {
     if (isContextLost())
         return nullptr;
 
     for (size_t i = 0; i < m_extensions.size(); ++i) {
         ExtensionTracker* tracker = m_extensions[i];
         if (tracker->matchesNameWithPrefixes(name)) {
-            if (tracker->webglDebugRendererInfo() && !allowWebGLDebugRendererInfo())
-                return nullptr;
-            if (tracker->privileged() && !allowPrivilegedExtensions())
-                return nullptr;
-            if (tracker->draft() && !RuntimeEnabledFeatures::webGLDraftExtensionsEnabled())
-                return nullptr;
-            if (!tracker->supported(this))
+            if (!extensionSupportedAndAllowed(tracker))
                 return nullptr;
 
             RefPtr<WebGLExtension> extension = tracker->getExtension(this);
             if (extension)
                 m_extensionEnabled[extension->name()] = true;
             return extension.release();
         }
     }
 
     return nullptr;
@@ skipping 432 matching lines @@
 }
 
 Vector<String> WebGLRenderingContextBase::getSupportedExtensions()
 {
     Vector<String> result;
     if (isContextLost())
         return result;
 
     for (size_t i = 0; i < m_extensions.size(); ++i) {
         ExtensionTracker* tracker = m_extensions[i];
-        if (tracker->webglDebugRendererInfo() && !allowWebGLDebugRendererInfo())
-            continue;
-        if (tracker->privileged() && !allowPrivilegedExtensions())
-            continue;
-        if (tracker->draft() && !RuntimeEnabledFeatures::webGLDraftExtensionsEnabled())
-            continue;
-        if (tracker->supported(this))
-            result.append(String(tracker->prefixed()  ? "WEBKIT_" : "") + tracker->extensionName());
+        if (extensionSupportedAndAllowed(tracker)) {
+            const char* const* prefixes = tracker->prefixes();
+            for (; *prefixes; ++prefixes) {
+                String prefixedName = String(*prefixes) + tracker->extensionName();
+                result.append(prefixedName);
+            }
+        }
     }
 
     return result;
 }
 
 WebGLGetInfo WebGLRenderingContextBase::getTexParameter(GLenum target, GLenum pname)
 {
     if (isContextLost())
         return WebGLGetInfo();
     WebGLTexture* tex = validateTextureBinding("getTexParameter", target, false);
@@ skipping 2980 matching lines @@
         if (m_textureUnits[i].m_texture2DBinding
             || m_textureUnits[i].m_textureCubeMapBinding) {
             m_onePlusMaxNonDefaultTextureUnit = i + 1;
             return;
         }
     }
     m_onePlusMaxNonDefaultTextureUnit = 0;
 }
 
 } // namespace WebCore