Title: [142545] trunk/Source/WebCore
Revision
142545
Author
z...@google.com
Date
2013-02-11 16:31:15 -0800 (Mon, 11 Feb 2013)

Log 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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (142544 => 142545)


--- trunk/Source/WebCore/ChangeLog	2013-02-12 00:29:20 UTC (rev 142544)
+++ trunk/Source/WebCore/ChangeLog	2013-02-12 00:31:15 UTC (rev 142545)
@@ -1,3 +1,14 @@
+2013-02-11  Zhenyao Mo  <z...@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  <e...@chromium.org>
 
         Change RenderFrameSet::paint to use m-rows/m_cols directly.

Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (142544 => 142545)


--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp	2013-02-12 00:29:20 UTC (rev 142544)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp	2013-02-12 00:31:15 UTC (rev 142545)
@@ -2405,9 +2405,10 @@
             m_webglLoseContext = WebGLLoseContext::create(this);
         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);
         return m_webglCompressedTextureS3TC.get();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to