Title: [143992] branches/chromium/1410/Source/WebCore
- Revision
- 143992
- Author
- z...@google.com
- Date
- 2013-02-25 17:35:20 -0800 (Mon, 25 Feb 2013)
Log Message
Merge 142545
> 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.
>
TBR=z...@google.com
Review URL: https://codereview.chromium.org/12334083
Modified Paths
Diff
Modified: branches/chromium/1410/Source/WebCore/ChangeLog (143991 => 143992)
--- branches/chromium/1410/Source/WebCore/ChangeLog 2013-02-26 01:24:02 UTC (rev 143991)
+++ branches/chromium/1410/Source/WebCore/ChangeLog 2013-02-26 01:35:20 UTC (rev 143992)
@@ -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 Keishi Hattori <kei...@webkit.org>
REGRESSION (r140778):Calendar Picker buttons are wrong when rtl
Modified: branches/chromium/1410/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (143991 => 143992)
--- branches/chromium/1410/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2013-02-26 01:24:02 UTC (rev 143991)
+++ branches/chromium/1410/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2013-02-26 01:35:20 UTC (rev 143992)
@@ -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
