<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193472] branches/safari-601-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193472">193472</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 14:37:57 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190446">r190446</a>. rdar://problem/23732367</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlcanvasWebGL2RenderingContextcpp">branches/safari-601-branch/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlcanvasWebGLRenderingContextcpp">branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlcanvasWebGLRenderingContextBaseh">branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorepageSettingsin">branches/safari-601-branch/Source/WebCore/page/Settings.in</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp">branches/safari-601-branch/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsfastcanvaswebglwebgldebugrendererinfoexpectedtxt">branches/safari-601-branch/LayoutTests/fast/canvas/webgl/webgl-debug-renderer-info-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcanvaswebglwebgldebugrendererinfohtml">branches/safari-601-branch/LayoutTests/fast/canvas/webgl/webgl-debug-renderer-info.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193471 => 193472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-04 22:28:11 UTC (rev 193471)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-04 22:37:57 UTC (rev 193472)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-04 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r190446. rdar://problem/23732367
+
+ 2015-10-01 Dean Jackson <dino@apple.com>
+
+ Expose WEBGL_debug_renderer_info
+ https://bugs.webkit.org/show_bug.cgi?id=149735
+ <rdar://problem/18343500>
+
+ Reviewed by Simon Fraser.
+
+ Modify a test from the 1.0.2 conformance suite to make sure
+ we're actually enabling and passing the info.
+
+ * fast/canvas/webgl/webgl-debug-renderer-info-expected.txt: Added.
+ * fast/canvas/webgl/webgl-debug-renderer-info.html: Added.
+
</ins><span class="cx"> 2015-12-04 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r187897. rdar://problem/23221163
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcanvaswebglwebgldebugrendererinfoexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/canvas/webgl/webgl-debug-renderer-info-expected.txt (0 => 193472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/canvas/webgl/webgl-debug-renderer-info-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/webgl/webgl-debug-renderer-info-expected.txt 2015-12-04 22:37:57 UTC (rev 193472)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+CONSOLE MESSAGE: line 97: WebGL: INVALID_ENUM: getParameter: invalid parameter name, WEBGL_debug_renderer_info not enabled
+CONSOLE MESSAGE: line 101: WebGL: INVALID_ENUM: getParameter: invalid parameter name, WEBGL_debug_renderer_info not enabled
+This test verifies the functionality of the WEBGL_debug_renderer_info extension, if it is available.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS WebGL context exists
+Testing enums with extension disabled
+PASS getError was expected value: INVALID_ENUM : UNMASKED_VENDOR_WEBGL should not be queryable if extension is disabled
+PASS getError was expected value: INVALID_ENUM : UNMASKED_RENDERER_WEBGL should not be queryable if extension is disabled
+PASS Successfully enabled WEBGL_debug_renderer_info extension
+PASS WEBGL_debug_renderer_info listed as supported and getExtension succeeded
+Testing enums with extension enabled
+PASS ext.UNMASKED_VENDOR_WEBGL is 0x9245
+PASS getError was expected value: NO_ERROR : UNMASKED_VENDOR_WEBGL query should succeed if extension is enable
+PASS ext.UNMASKED_RENDERER_WEBGL is 0x9246
+PASS getError was expected value: NO_ERROR : UNMASKED_RENDERER_WEBGL query should succeed if extension is enable
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcanvaswebglwebgldebugrendererinfohtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/canvas/webgl/webgl-debug-renderer-info.html (0 => 193472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/canvas/webgl/webgl-debug-renderer-info.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/webgl/webgl-debug-renderer-info.html 2015-12-04 22:37:57 UTC (rev 193472)
</span><span class="lines">@@ -0,0 +1,123 @@
</span><ins>+<!--
+
+/*
+** Copyright (c) 2012 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+-->
+
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>WebGL WebGL_debug_renderer_info Conformance Tests</title>
+<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
+<script src="../../../resources/js-test-pre.js"></script>
+<script src="resources/webgl-test.js"></script>
+<script src="resources/webgl-test-utils.js"></script>
+</head>
+<body>
+<div id="description"></div>
+<canvas id="canvas" style="width: 1px; height: 1px;"> </canvas>
+<div id="console"></div>
+
+<script>
+"use strict";
+description("This test verifies the functionality of the WEBGL_debug_renderer_info extension, if it is available.");
+
+debug("");
+
+var wtu = WebGLTestUtils;
+var gl = wtu.create3DContext("canvas");
+var ext = null;
+var vao = null;
+
+if (!gl) {
+ testFailed("WebGL context does not exist");
+} else {
+ testPassed("WebGL context exists");
+
+ // Run tests with extension disabled
+ runTestDisabled();
+
+ // Query the extension and store globally so shouldBe can access it
+ ext = gl.getExtension("WEBGL_debug_renderer_info");
+ if (!ext) {
+ testFailed("No WEBGL_debug_renderer_info support");
+ } else {
+ testPassed("Successfully enabled WEBGL_debug_renderer_info extension");
+
+ runSupportedTest(true);
+ runTestEnabled();
+ }
+}
+
+function runSupportedTest(extensionEnabled) {
+ var supported = gl.getSupportedExtensions();
+ if (supported.indexOf("WEBGL_debug_renderer_info") >= 0) {
+ if (extensionEnabled) {
+ testPassed("WEBGL_debug_renderer_info listed as supported and getExtension succeeded");
+ } else {
+ testFailed("WEBGL_debug_renderer_info listed as supported but getExtension failed");
+ }
+ } else {
+ if (extensionEnabled) {
+ testFailed("WEBGL_debug_renderer_info not listed as supported but getExtension succeeded");
+ } else {
+ testPassed("WEBGL_debug_renderer_info not listed as supported and getExtension failed -- this is legal");
+ }
+ }
+}
+
+function runTestDisabled() {
+ debug("Testing enums with extension disabled");
+
+ // Use the constants directly as we don't have the extension
+
+ var UNMASKED_VENDOR_WEBGL = 0x9245;
+ gl.getParameter(UNMASKED_VENDOR_WEBGL);
+ glErrorShouldBe(gl, gl.INVALID_ENUM, "UNMASKED_VENDOR_WEBGL should not be queryable if extension is disabled");
+
+ var UNMASKED_RENDERER_WEBGL = 0x9246;
+ gl.getParameter(UNMASKED_RENDERER_WEBGL);
+ glErrorShouldBe(gl, gl.INVALID_ENUM, "UNMASKED_RENDERER_WEBGL should not be queryable if extension is disabled");
+}
+
+function runTestEnabled() {
+ debug("Testing enums with extension enabled");
+
+ shouldBe("ext.UNMASKED_VENDOR_WEBGL", "0x9245");
+ gl.getParameter(ext.UNMASKED_VENDOR_WEBGL);
+ glErrorShouldBe(gl, gl.NO_ERROR, "UNMASKED_VENDOR_WEBGL query should succeed if extension is enable");
+
+ shouldBe("ext.UNMASKED_RENDERER_WEBGL", "0x9246");
+ gl.getParameter(ext.UNMASKED_RENDERER_WEBGL);
+ glErrorShouldBe(gl, gl.NO_ERROR, "UNMASKED_RENDERER_WEBGL query should succeed if extension is enable");
+}
+
+debug("");
+var successfullyParsed = true;
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193471 => 193472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-04 22:28:11 UTC (rev 193471)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-04 22:37:57 UTC (rev 193472)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2015-12-04 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r190446. rdar://problem/23732367
+
+ 2015-10-01 Dean Jackson <dino@apple.com>
+
+ Expose WEBGL_debug_renderer_info
+ https://bugs.webkit.org/show_bug.cgi?id=149735
+ <rdar://problem/18343500>
+
+ Reviewed by Simon Fraser.
+
+ Enable the extension that allows content to query
+ for the GPUs vendor and details.
+
+ Now that we're enabling this, there was no need for
+ the internal setting that identified privileged situations.
+ However, since this meant that WEBGL_debug_shaders was
+ also exposed, I explicitly disable it since it is
+ not yet conformant.
+
+ Test: fast/canvas/webgl/webgl-debug-renderer-info.html
+ as well as the general conformance suite.
+
+ * html/canvas/WebGL2RenderingContext.cpp: No need to guard around allowPrivilegedExtensions().
+ (WebCore::WebGL2RenderingContext::getExtension):
+ (WebCore::WebGL2RenderingContext::getSupportedExtensions):
+ * html/canvas/WebGLRenderingContext.cpp: Ditto.
+ (WebCore::WebGLRenderingContext::getExtension):
+ (WebCore::WebGLRenderingContext::getSupportedExtensions):
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::allowPrivilegedExtensions): Deleted.
+ * html/canvas/WebGLRenderingContextBase.h:
+ * page/Settings.in: Remove privilegedWebGLExtensions.
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp: Forbid the translated shader
+ extension while it is still buggy.
+ (WebCore::Extensions3DOpenGL::supportsExtension):
+
</ins><span class="cx"> 2015-12-03 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r188647. rdar://problem/23732386
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlcanvasWebGL2RenderingContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (193471 => 193472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2015-12-04 22:28:11 UTC (rev 193471)
+++ branches/safari-601-branch/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2015-12-04 22:37:57 UTC (rev 193472)
</span><span class="lines">@@ -1021,20 +1021,18 @@
</span><span class="cx"> }
</span><span class="cx"> return m_webglDepthTexture.get();
</span><span class="cx"> }
</span><del>- if (allowPrivilegedExtensions()) {
- if (equalIgnoringCase(name, "WEBGL_debug_renderer_info")) {
- if (!m_webglDebugRendererInfo)
- m_webglDebugRendererInfo = std::make_unique<WebGLDebugRendererInfo>(this);
- return m_webglDebugRendererInfo.get();
- }
- if (equalIgnoringCase(name, "WEBGL_debug_shaders")
- && m_context->getExtensions()->supports("GL_ANGLE_translated_shader_source")) {
- if (!m_webglDebugShaders)
- m_webglDebugShaders = std::make_unique<WebGLDebugShaders>(this);
- return m_webglDebugShaders.get();
- }
</del><ins>+ if (equalIgnoringCase(name, "WEBGL_debug_renderer_info")) {
+ if (!m_webglDebugRendererInfo)
+ m_webglDebugRendererInfo = std::make_unique<WebGLDebugRendererInfo>(this);
+ return m_webglDebugRendererInfo.get();
</ins><span class="cx"> }
</span><del>-
</del><ins>+ if (equalIgnoringCase(name, "WEBGL_debug_shaders")
+ && m_context->getExtensions()->supports("GL_ANGLE_translated_shader_source")) {
+ if (!m_webglDebugShaders)
+ m_webglDebugShaders = std::make_unique<WebGLDebugShaders>(this);
+ return m_webglDebugShaders.get();
+ }
+
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1064,12 +1062,10 @@
</span><span class="cx"> if (WebGLDepthTexture::supported(graphicsContext3D()))
</span><span class="cx"> result.append("WEBGL_depth_texture");
</span><span class="cx"> result.append("WEBGL_lose_context");
</span><del>- if (allowPrivilegedExtensions()) {
- if (m_context->getExtensions()->supports("GL_ANGLE_translated_shader_source"))
- result.append("WEBGL_debug_shaders");
- result.append("WEBGL_debug_renderer_info");
- }
-
</del><ins>+ if (m_context->getExtensions()->supports("GL_ANGLE_translated_shader_source"))
+ result.append("WEBGL_debug_shaders");
+ result.append("WEBGL_debug_renderer_info");
+
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (193471 => 193472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-12-04 22:28:11 UTC (rev 193471)
+++ branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-12-04 22:37:57 UTC (rev 193472)
</span><span class="lines">@@ -226,20 +226,18 @@
</span><span class="cx"> }
</span><span class="cx"> return m_angleInstancedArrays.get();
</span><span class="cx"> }
</span><del>- if (allowPrivilegedExtensions()) {
- if (equalIgnoringCase(name, "WEBGL_debug_renderer_info")) {
- if (!m_webglDebugRendererInfo)
- m_webglDebugRendererInfo = std::make_unique<WebGLDebugRendererInfo>(this);
- return m_webglDebugRendererInfo.get();
- }
- if (equalIgnoringCase(name, "WEBGL_debug_shaders")
- && m_context->getExtensions()->supports("GL_ANGLE_translated_shader_source")) {
- if (!m_webglDebugShaders)
- m_webglDebugShaders = std::make_unique<WebGLDebugShaders>(this);
- return m_webglDebugShaders.get();
- }
</del><ins>+ if (equalIgnoringCase(name, "WEBGL_debug_renderer_info")) {
+ if (!m_webglDebugRendererInfo)
+ m_webglDebugRendererInfo = std::make_unique<WebGLDebugRendererInfo>(this);
+ return m_webglDebugRendererInfo.get();
</ins><span class="cx"> }
</span><del>-
</del><ins>+ if (equalIgnoringCase(name, "WEBGL_debug_shaders")
+ && m_context->getExtensions()->supports("GL_ANGLE_translated_shader_source")) {
+ if (!m_webglDebugShaders)
+ m_webglDebugShaders = std::make_unique<WebGLDebugShaders>(this);
+ return m_webglDebugShaders.get();
+ }
+
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -287,13 +285,10 @@
</span><span class="cx"> result.append("WEBGL_draw_buffers");
</span><span class="cx"> if (ANGLEInstancedArrays::supported(this))
</span><span class="cx"> result.append("ANGLE_instanced_arrays");
</span><del>-
- if (allowPrivilegedExtensions()) {
- if (m_context->getExtensions()->supports("GL_ANGLE_translated_shader_source"))
- result.append("WEBGL_debug_shaders");
- result.append("WEBGL_debug_renderer_info");
- }
-
</del><ins>+ if (m_context->getExtensions()->supports("GL_ANGLE_translated_shader_source"))
+ result.append("WEBGL_debug_shaders");
+ result.append("WEBGL_debug_renderer_info");
+
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (193471 => 193472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-12-04 22:28:11 UTC (rev 193471)
+++ branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-12-04 22:37:57 UTC (rev 193472)
</span><span class="lines">@@ -576,13 +576,6 @@
</span><span class="cx"> m_isRobustnessEXTSupported = m_context->getExtensions()->isEnabled("GL_EXT_robustness");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebGLRenderingContextBase::allowPrivilegedExtensions() const
-{
- if (Page* page = canvas()->document().page())
- return page->settings().privilegedWebGLExtensionsEnabled();
- return false;
-}
-
</del><span class="cx"> void WebGLRenderingContextBase::addCompressedTextureFormat(GC3Denum format)
</span><span class="cx"> {
</span><span class="cx"> if (!m_compressedTextureFormats.contains(format))
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlcanvasWebGLRenderingContextBaseh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.h (193471 => 193472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2015-12-04 22:28:11 UTC (rev 193471)
+++ branches/safari-601-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2015-12-04 22:37:57 UTC (rev 193472)
</span><span class="lines">@@ -800,10 +800,6 @@
</span><span class="cx"> // Helper for restoration after context lost.
</span><span class="cx"> void maybeRestoreContext();
</span><span class="cx">
</span><del>- // Determine if we are running privileged code in the browser, for example,
- // a Safari or Chrome extension.
- bool allowPrivilegedExtensions() const;
-
</del><span class="cx"> enum ConsoleDisplayPreference {
</span><span class="cx"> DisplayInConsole,
</span><span class="cx"> DontDisplayInConsole
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/Settings.in (193471 => 193472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/Settings.in 2015-12-04 22:28:11 UTC (rev 193471)
+++ branches/safari-601-branch/Source/WebCore/page/Settings.in 2015-12-04 22:37:57 UTC (rev 193472)
</span><span class="lines">@@ -103,7 +103,6 @@
</span><span class="cx"> webGLEnabled initial=false
</span><span class="cx"> webGLErrorsToConsoleEnabled initial=true
</span><span class="cx"> openGLMultisamplingEnabled initial=true
</span><del>-privilegedWebGLExtensionsEnabled initial=false
</del><span class="cx"> forceSoftwareWebGLRendering initial=false
</span><span class="cx"> accelerated2dCanvasEnabled initial=false
</span><span class="cx"> antialiased2dCanvasEnabled initial=true
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (193471 => 193472)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2015-12-04 22:28:11 UTC (rev 193471)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2015-12-04 22:37:57 UTC (rev 193472)
</span><span class="lines">@@ -167,6 +167,12 @@
</span><span class="cx"> && (m_availableExtensions.contains("GL_ARB_draw_instanced") || m_availableExtensions.contains("GL_EXT_draw_instanced"));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // We explicitly do not support this extension until
+ // we fix the following bug:
+ // https://bugs.webkit.org/show_bug.cgi?id=149734
+ if (name == "GL_ANGLE_translated_shader_source")
+ return false;
+
</ins><span class="cx"> if (name == "GL_EXT_sRGB")
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> return m_availableExtensions.contains("GL_EXT_sRGB");
</span></span></pre>
</div>
</div>
</body>
</html>