| Index: Source/core/html/canvas/WebGLRenderingContext.cpp
|
| diff --git a/Source/core/html/canvas/WebGLRenderingContext.cpp b/Source/core/html/canvas/WebGLRenderingContext.cpp
|
| index e1d1c070724ad2c9a2c4827c66532b2f4cc5431a..1e34b4523b365c8e796077190d88663fb8ef3869 100644
|
| --- a/Source/core/html/canvas/WebGLRenderingContext.cpp
|
| +++ b/Source/core/html/canvas/WebGLRenderingContext.cpp
|
| @@ -123,10 +123,12 @@ WebGLRenderingContext::~WebGLRenderingContext()
|
| void WebGLRenderingContext::registerContextExtensions()
|
| {
|
| // Register extensions.
|
| - static const char* const webkitPrefix[] = { "WEBKIT_", 0, };
|
| static const char* const bothPrefixes[] = { "", "WEBKIT_", 0, };
|
|
|
| registerExtension<ANGLEInstancedArrays>(m_angleInstancedArrays);
|
| + registerExtension<EXTBlendMinMax>(m_extBlendMinMax);
|
| + registerExtension<EXTFragDepth>(m_extFragDepth);
|
| + registerExtension<EXTShaderTextureLOD>(m_extShaderTextureLOD);
|
| registerExtension<EXTTextureFilterAnisotropic>(m_extTextureFilterAnisotropic, ApprovedExtension, bothPrefixes);
|
| registerExtension<OESElementIndexUint>(m_oesElementIndexUint);
|
| registerExtension<OESStandardDerivatives>(m_oesStandardDerivatives);
|
| @@ -135,20 +137,15 @@ void WebGLRenderingContext::registerContextExtensions()
|
| registerExtension<OESTextureHalfFloat>(m_oesTextureHalfFloat);
|
| registerExtension<OESTextureHalfFloatLinear>(m_oesTextureHalfFloatLinear);
|
| registerExtension<OESVertexArrayObject>(m_oesVertexArrayObject);
|
| - registerExtension<WebGLCompressedTextureATC>(m_webglCompressedTextureATC, EnabledDraftExtension, webkitPrefix);
|
| - registerExtension<WebGLCompressedTexturePVRTC>(m_webglCompressedTexturePVRTC, EnabledDraftExtension, webkitPrefix);
|
| + registerExtension<WebGLCompressedTextureATC>(m_webglCompressedTextureATC, ApprovedExtension, bothPrefixes);
|
| + registerExtension<WebGLCompressedTextureETC1>(m_webglCompressedTextureETC1);
|
| + registerExtension<WebGLCompressedTexturePVRTC>(m_webglCompressedTexturePVRTC, ApprovedExtension, bothPrefixes);
|
| registerExtension<WebGLCompressedTextureS3TC>(m_webglCompressedTextureS3TC, ApprovedExtension, bothPrefixes);
|
| registerExtension<WebGLDebugRendererInfo>(m_webglDebugRendererInfo);
|
| registerExtension<WebGLDebugShaders>(m_webglDebugShaders);
|
| registerExtension<WebGLDepthTexture>(m_webglDepthTexture, ApprovedExtension, bothPrefixes);
|
| registerExtension<WebGLDrawBuffers>(m_webglDrawBuffers);
|
| registerExtension<WebGLLoseContext>(m_webglLoseContext, ApprovedExtension, bothPrefixes);
|
| -
|
| - // Register draft extensions.
|
| - registerExtension<EXTBlendMinMax>(m_extBlendMinMax, DraftExtension);
|
| - registerExtension<EXTFragDepth>(m_extFragDepth, DraftExtension);
|
| - registerExtension<EXTShaderTextureLOD>(m_extShaderTextureLOD, DraftExtension);
|
| - registerExtension<WebGLCompressedTextureETC1>(m_webglCompressedTextureETC1, DraftExtension);
|
| }
|
|
|
| } // namespace WebCore
|
|
|