Changeset 142545 in webkit

Timestamp:

Feb 11, 2013, 4:31:15 PM (12 years ago)

Author:

zmo@google.com

Message:

WEBGL_compressed_texture_s3tc extension can be enabled even when not supported
​https://bugs.webkit.org/show_bug.cgi?id=109508

Reviewed by Kenneth Russell.

• html/canvas/WebGLRenderingContext.cpp:

(WebCore):
(WebCore::WebGLRenderingContext::getExtension): Check whether the extension support is there before returning the extension pointer.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLRenderingContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-11  Zhenyao Mo  <zmo@google.com>
+
+        WEBGL_compressed_texture_s3tc extension can be enabled even when not supported
+        https://bugs.webkit.org/show_bug.cgi?id=109508
+
+        Reviewed by Kenneth Russell.
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore):
+        (WebCore::WebGLRenderingContext::getExtension): Check whether the extension support is there before returning the extension pointer.
+
 2013-02-11  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -2406 +2406 @@
         return m_webglLoseContext.get();
     }
-    if (equalIgnoringCase(name, "WEBGL_compressed_texture_s3tc")
-        // FIXME: remove this after a certain grace period.
-        || equalIgnoringCase(name, "WEBKIT_WEBGL_compressed_texture_s3tc")) {
+    if ((equalIgnoringCase(name, "WEBGL_compressed_texture_s3tc")
+         // FIXME: remove this after a certain grace period.
+         || equalIgnoringCase(name, "WEBKIT_WEBGL_compressed_texture_s3tc"))
+        && WebGLCompressedTextureS3TC::supported(this)) {
         if (!m_webglCompressedTextureS3TC)
             m_webglCompressedTextureS3TC = WebGLCompressedTextureS3TC::create(this);