<!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>[200435] trunk</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/200435">200435</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-05-04 15:27:58 -0700 (Wed, 04 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disabling WebGL2 should mean no context is created
https://bugs.webkit.org/show_bug.cgi?id=157352
<rdar://problem/26096346>
Reviewed by Eric Carlson.
Source/WebCore:
If WebGL2 is disabled by the runtime flag, we should
not create a context.
Test: fast/canvas/webgl/webgl2-runtime-flag.html
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::create):
* testing/Internals.cpp: Added some helpers to toggle the runtime setting.
(WebCore::Internals::webGL2Enabled):
(WebCore::Internals::setWebGL2Enabled):
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
Check that toggling the runtime flag enables/disables WebGL 2.0.
* fast/canvas/webgl/webgl2-runtime-flag-expected.txt: Added.
* fast/canvas/webgl/webgl2-runtime-flag.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvaswebglwebgl2runtimeflagexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/webgl2-runtime-flag-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebglwebgl2runtimeflaghtml">trunk/LayoutTests/fast/canvas/webgl/webgl2-runtime-flag.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200434 => 200435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-04 22:22:31 UTC (rev 200434)
+++ trunk/LayoutTests/ChangeLog 2016-05-04 22:27:58 UTC (rev 200435)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-05-04 Dean Jackson <dino@apple.com>
+
+ Disabling WebGL2 should mean no context is created
+ https://bugs.webkit.org/show_bug.cgi?id=157352
+ <rdar://problem/26096346>
+
+ Reviewed by Eric Carlson.
+
+ Check that toggling the runtime flag enables/disables WebGL 2.0.
+
+ * fast/canvas/webgl/webgl2-runtime-flag-expected.txt: Added.
+ * fast/canvas/webgl/webgl2-runtime-flag.html: Added.
+
</ins><span class="cx"> 2016-05-04 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Media elements should not be paused right away when removed from the document
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglwebgl2runtimeflagexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/webgl2-runtime-flag-expected.txt (0 => 200435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/webgl2-runtime-flag-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/webgl2-runtime-flag-expected.txt 2016-05-04 22:27:58 UTC (rev 200435)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS: WebGL 2.0 was available when enabled.
+PASS: WebGL 2.0 was not available when disabled.
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/canvas/webgl/webgl2-runtime-flag-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastcanvaswebglwebgl2runtimeflaghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/webgl2-runtime-flag.html (0 => 200435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/webgl2-runtime-flag.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/webgl2-runtime-flag.html 2016-05-04 22:27:58 UTC (rev 200435)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<script>
+
+if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+function getContext(name) {
+ var c = document.createElement("canvas");
+ return c.getContext(name);
+}
+
+function run() {
+ var output;
+
+ output = document.getElementById("output1");
+
+ if (!window.testRunner) {
+ output.textContent = "This test only runs inside DRT/WKTR.";
+ return;
+ }
+
+ var originalSetting = window.internals.webGL2Enabled();
+
+ window.internals.setWebGL2Enabled(true);
+ var ctx = getContext("webgl2");
+ if (ctx)
+ output.textContent = "PASS: WebGL 2.0 was available when enabled.";
+ else
+ output.textContent = "FAIL: WebGL 2.0 was not available when enabled.";
+
+ output = document.getElementById("output2");
+
+ window.internals.setWebGL2Enabled(false);
+ var ctx = getContext("webgl2");
+ if (ctx)
+ output.textContent = "FAIL: WebGL 2.0 was available when disabled.";
+ else
+ output.textContent = "PASS: WebGL 2.0 was not available when disabled.";
+
+ window.internals.setWebGL2Enabled(originalSetting);
+}
+
+window.addEventListener("load", run, false);
+
+</script>
+<div id="output1"></div>
+<div id="output2"></div>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/canvas/webgl/webgl2-runtime-flag.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200434 => 200435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-04 22:22:31 UTC (rev 200434)
+++ trunk/Source/WebCore/ChangeLog 2016-05-04 22:27:58 UTC (rev 200435)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-04 Dean Jackson <dino@apple.com>
+
+ Disabling WebGL2 should mean no context is created
+ https://bugs.webkit.org/show_bug.cgi?id=157352
+ <rdar://problem/26096346>
+
+ Reviewed by Eric Carlson.
+
+ If WebGL2 is disabled by the runtime flag, we should
+ not create a context.
+
+ Test: fast/canvas/webgl/webgl2-runtime-flag.html
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::create):
+ * testing/Internals.cpp: Added some helpers to toggle the runtime setting.
+ (WebCore::Internals::webGL2Enabled):
+ (WebCore::Internals::setWebGL2Enabled):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2016-05-04 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add an override point for drawing named images in ThemeCocoa
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (200434 => 200435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-05-04 22:22:31 UTC (rev 200434)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-05-04 22:27:58 UTC (rev 200435)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> #include "OESVertexArrayObject.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderBox.h"
</span><ins>+#include "RuntimeEnabledFeatures.h"
</ins><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "WebGL2RenderingContext.h"
</span><span class="cx"> #include "WebGLActiveInfo.h"
</span><span class="lines">@@ -348,7 +349,10 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebGLRenderingContextBase> WebGLRenderingContextBase::create(HTMLCanvasElement* canvas, WebGLContextAttributes* attrs, const String& type)
</span><span class="cx"> {
</span><del>-#if !ENABLE(WEBGL2)
</del><ins>+#if ENABLE(WEBGL2)
+ if (type == "webgl2" && !RuntimeEnabledFeatures::sharedFeatures().webGL2Enabled())
+ return nullptr;
+#else
</ins><span class="cx"> UNUSED_PARAM(type);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (200434 => 200435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-05-04 22:22:31 UTC (rev 200434)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-05-04 22:27:58 UTC (rev 200435)
</span><span class="lines">@@ -3316,6 +3316,18 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WEBGL2)
+bool Internals::webGL2Enabled() const
+{
+ return RuntimeEnabledFeatures::sharedFeatures().webGL2Enabled();
+}
+
+void Internals::setWebGL2Enabled(bool enable)
+{
+ RuntimeEnabledFeatures::sharedFeatures().setWebGL2Enabled(enable);
+}
+#endif
+
</ins><span class="cx"> void Internals::setResourceTimingSupport(bool enable)
</span><span class="cx"> {
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setResourceTimingEnabled(enable);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (200434 => 200435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2016-05-04 22:22:31 UTC (rev 200434)
+++ trunk/Source/WebCore/testing/Internals.h 2016-05-04 22:27:58 UTC (rev 200435)
</span><span class="lines">@@ -478,6 +478,11 @@
</span><span class="cx"> void setCSSGridLayoutEnabled(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WEBGL2)
+ bool webGL2Enabled() const;
+ void setWebGL2Enabled(bool);
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit Internals(Document&);
</span><span class="cx"> Document* contextDocument() const;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (200434 => 200435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2016-05-04 22:22:31 UTC (rev 200434)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-05-04 22:27:58 UTC (rev 200435)
</span><span class="lines">@@ -453,5 +453,10 @@
</span><span class="cx"> void setCSSGridLayoutEnabled(boolean enable);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(ENABLE_WEBGL2) && ENABLE_WEBGL2
+ boolean webGL2Enabled();
+ void setWebGL2Enabled(boolean enable);
+#endif
+
</ins><span class="cx"> void setResourceTimingSupport(boolean scalable);
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>