Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebCore/html/canvas/WebGLRenderingContext.cpp

Issue 12334083: Merge 142545 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/html/canvas/WebGLRenderingContext.cpp
===================================================================
--- Source/WebCore/html/canvas/WebGLRenderingContext.cpp (revision 143991)
+++ Source/WebCore/html/canvas/WebGLRenderingContext.cpp (working copy)
@@ -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();
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698