<!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>[199062] 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/199062">199062</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-05 09:54:07 -0700 (Tue, 05 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebGL2] Turn the ENABLE_WEBGL2 flag on
https://bugs.webkit.org/show_bug.cgi?id=156061
<rdar://problem/25463193>
Patch by Antoine Quint <graouts@apple.com> on 2016-04-05
Reviewed by Alex Christensen.
Source/JavaScriptCore:
* Configurations/FeatureDefines.xcconfig:
* runtime/CommonIdentifiers.h:
Define the conditionalized classes WebGL2RenderingContext and WebGLVertexArrayObject.
Source/WebCore:
Conditionalize the definition of the WebGL2RenderingContext and WebGLVertexArrayObject globals
based on the new WebGL2 runtime flag we introduced in https://webkit.org/b/156166.
Turning the ENABLE_WEBGL2 flag on caused a host of build errors which we fix here. A non-obvious
error was in code generated from the html/canvas/WebGL2RenderingContext.idl file which was solved
by updating the getBufferSubData() method to the current signature as of the March 29 Editor's
Draft of the WebGL 2 Specification (https://www.khronos.org/registry/webgl/specs/latest/2.0/).
Missing JSC headers in WebGL2RenderingContext.cpp also caused some linking errors in Release builds.
Tests: webgl/webgl-vertex-array-object-defined.html
webgl/webgl2-rendering-context-defined.html
webgl/webgl2-rendering-context-obtain.html
* Configurations/FeatureDefines.xcconfig:
* bindings/js/JSWebGL2RenderingContextCustom.cpp:
(WebCore::JSWebGL2RenderingContext::getInternalformatParameter):
(WebCore::JSWebGL2RenderingContext::getQueryParameter):
(WebCore::JSWebGL2RenderingContext::getSamplerParameter):
(WebCore::JSWebGL2RenderingContext::getSyncParameter):
(WebCore::JSWebGL2RenderingContext::getIndexedParameter):
(WebCore::JSWebGL2RenderingContext::getActiveUniformBlockParameter):
(WebCore::JSWebGL2RenderingContext::getActiveUniformBlockName):
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::is3dType):
* html/canvas/WebGL2RenderingContext.cpp:
(WebCore::WebGL2RenderingContext::getBufferSubData): Deleted.
* html/canvas/WebGL2RenderingContext.idl:
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::create):
* html/canvas/WebGLVertexArrayObject.idl:
Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
LayoutTests:
* platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
* platform/mac/js/dom/global-constructors-attributes-expected.txt:
The WebGL2RenderingContext and WebGLVertexArrayObject classes are now defined
so expectations for this test which lists the configuration of global constructors
needed to be updated.
* webgl/webgl-vertex-array-object-defined-expected.txt: Added.
* webgl/webgl-vertex-array-object-defined.html: Added.
Test checking that WebGLVertexArrayObject is defined.
* webgl/webgl2-rendering-context-defined-expected.txt: Added.
* webgl/webgl2-rendering-context-defined.html: Added.
Test checking that WebGL2RenderingContext is defined.
* webgl/webgl2-rendering-context-obtain-expected.txt: Added.
* webgl/webgl2-rendering-context-obtain.html: Added.
Test checking that asking for a "webgl2" context returns a WebGL2RenderingContext.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacyosemitejsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonIdentifiersh">trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWebGL2RenderingContextCustomcpp">trunk/Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGL2RenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGL2RenderingContextidl">trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjectidl">trunk/Source/WebCore/html/canvas/WebGLVertexArrayObject.idl</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebglwebglvertexarrayobjectdefinedexpectedtxt">trunk/LayoutTests/webgl/webgl-vertex-array-object-defined-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebglwebglvertexarrayobjectdefinedhtml">trunk/LayoutTests/webgl/webgl-vertex-array-object-defined.html</a></li>
<li><a href="#trunkLayoutTestswebglwebgl2renderingcontextdefinedexpectedtxt">trunk/LayoutTests/webgl/webgl2-rendering-context-defined-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebglwebgl2renderingcontextdefinedhtml">trunk/LayoutTests/webgl/webgl2-rendering-context-defined.html</a></li>
<li><a href="#trunkLayoutTestswebglwebgl2renderingcontextobtainexpectedtxt">trunk/LayoutTests/webgl/webgl2-rendering-context-obtain-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebglwebgl2renderingcontextobtainhtml">trunk/LayoutTests/webgl/webgl2-rendering-context-obtain.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/LayoutTests/ChangeLog 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-04-05 Antoine Quint <graouts@apple.com>
+
+ [WebGL2] Turn the ENABLE_WEBGL2 flag on
+ https://bugs.webkit.org/show_bug.cgi?id=156061
+ <rdar://problem/25463193>
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
+ * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+
+ The WebGL2RenderingContext and WebGLVertexArrayObject classes are now defined
+ so expectations for this test which lists the configuration of global constructors
+ needed to be updated.
+
+ * webgl/webgl-vertex-array-object-defined-expected.txt: Added.
+ * webgl/webgl-vertex-array-object-defined.html: Added.
+
+ Test checking that WebGLVertexArrayObject is defined.
+
+ * webgl/webgl2-rendering-context-defined-expected.txt: Added.
+ * webgl/webgl2-rendering-context-defined.html: Added.
+
+ Test checking that WebGL2RenderingContext is defined.
+
+ * webgl/webgl2-rendering-context-obtain-expected.txt: Added.
+ * webgl/webgl2-rendering-context-obtain.html: Added.
+
+ Test checking that asking for a "webgl2" context returns a WebGL2RenderingContext.
+
</ins><span class="cx"> 2016-04-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> We sometimes fail to remove outdated entry from the disk cache after revalidation and when the resource is no longer cacheable
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -2113,6 +2113,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WeakSet').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WeakSet').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WeakSet').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'WebGL2RenderingContext').value is WebGL2RenderingContext
+PASS Object.getOwnPropertyDescriptor(global, 'WebGL2RenderingContext').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebGL2RenderingContext').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebGL2RenderingContext').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebGL2RenderingContext').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebGLActiveInfo').value is WebGLActiveInfo
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebGLActiveInfo').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebGLActiveInfo').hasOwnProperty('set') is false
</span><span class="lines">@@ -2188,6 +2193,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebGLUniformLocation').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebGLUniformLocation').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebGLUniformLocation').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'WebGLVertexArrayObject').value is WebGLVertexArrayObject
+PASS Object.getOwnPropertyDescriptor(global, 'WebGLVertexArrayObject').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebGLVertexArrayObject').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebGLVertexArrayObject').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebGLVertexArrayObject').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitAnimationEvent').value is WebKitAnimationEvent
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitAnimationEvent').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitAnimationEvent').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacyosemitejsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -2113,6 +2113,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WeakSet').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WeakSet').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WeakSet').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'WebGL2RenderingContext').value is WebGL2RenderingContext
+PASS Object.getOwnPropertyDescriptor(global, 'WebGL2RenderingContext').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebGL2RenderingContext').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebGL2RenderingContext').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebGL2RenderingContext').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebGLActiveInfo').value is WebGLActiveInfo
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebGLActiveInfo').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebGLActiveInfo').hasOwnProperty('set') is false
</span><span class="lines">@@ -2188,6 +2193,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebGLUniformLocation').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebGLUniformLocation').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebGLUniformLocation').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'WebGLVertexArrayObject').value is WebGLVertexArrayObject
+PASS Object.getOwnPropertyDescriptor(global, 'WebGLVertexArrayObject').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebGLVertexArrayObject').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebGLVertexArrayObject').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebGLVertexArrayObject').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitAnimationEvent').value is WebKitAnimationEvent
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitAnimationEvent').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitAnimationEvent').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestswebglwebglvertexarrayobjectdefinedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webgl/webgl-vertex-array-object-defined-expected.txt (0 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/webgl-vertex-array-object-defined-expected.txt (rev 0)
+++ trunk/LayoutTests/webgl/webgl-vertex-array-object-defined-expected.txt 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if WebGLVertexArrayObject is defined.
</ins></span></pre></div>
<a id="trunkLayoutTestswebglwebglvertexarrayobjectdefinedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webgl/webgl-vertex-array-object-defined.html (0 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/webgl-vertex-array-object-defined.html (rev 0)
+++ trunk/LayoutTests/webgl/webgl-vertex-array-object-defined.html 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<div id="result">PASS if WebGLVertexArrayObject is defined.</div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+if (typeof WebGLVertexArrayObject === "undefined")
+ document.getElementById("result").innerHTML = "FAIL";
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestswebglwebgl2renderingcontextdefinedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webgl/webgl2-rendering-context-defined-expected.txt (0 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/webgl2-rendering-context-defined-expected.txt (rev 0)
+++ trunk/LayoutTests/webgl/webgl2-rendering-context-defined-expected.txt 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if WebGL2RenderingContext is defined.
</ins></span></pre></div>
<a id="trunkLayoutTestswebglwebgl2renderingcontextdefinedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webgl/webgl2-rendering-context-defined.html (0 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/webgl2-rendering-context-defined.html (rev 0)
+++ trunk/LayoutTests/webgl/webgl2-rendering-context-defined.html 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<div id="result">PASS if WebGL2RenderingContext is defined.</div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+if (typeof WebGL2RenderingContext === "undefined")
+ document.getElementById("result").innerHTML = "FAIL";
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestswebglwebgl2renderingcontextobtainexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webgl/webgl2-rendering-context-obtain-expected.txt (0 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/webgl2-rendering-context-obtain-expected.txt (rev 0)
+++ trunk/LayoutTests/webgl/webgl2-rendering-context-obtain-expected.txt 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if a "webgl2" context can be obtained.
</ins></span></pre></div>
<a id="trunkLayoutTestswebglwebgl2renderingcontextobtainhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webgl/webgl2-rendering-context-obtain.html (0 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/webgl2-rendering-context-obtain.html (rev 0)
+++ trunk/LayoutTests/webgl/webgl2-rendering-context-obtain.html 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<div id="result">PASS if a "webgl2" context can be obtained.</div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+if (!(document.createElement("canvas").getContext("webgl2") instanceof WebGL2RenderingContext))
+ document.getElementById("result").innerHTML = "FAIL";
+</script>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-05 Antoine Quint <graouts@apple.com>
+
+ [WebGL2] Turn the ENABLE_WEBGL2 flag on
+ https://bugs.webkit.org/show_bug.cgi?id=156061
+ <rdar://problem/25463193>
+
+ Reviewed by Alex Christensen.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * runtime/CommonIdentifiers.h:
+
+ Define the conditionalized classes WebGL2RenderingContext and WebGLVertexArrayObject.
+
</ins><span class="cx"> 2016-04-04 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Add missing EABI_32BIT_DUMMY_ARG arguments for some callOperation(J_JITOperation_EGReoJ, ...) overloads
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> ENABLE_VIEW_MODE_CSS_MEDIA = ;
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><del>-ENABLE_WEBGL2 = ;
</del><ins>+ENABLE_WEBGL2 = ENABLE_WEBGL2;
</ins><span class="cx"> ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</span><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonIdentifiersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -87,6 +87,8 @@
</span><span class="cx"> macro(UTC) \
</span><span class="cx"> macro(WeakMap)\
</span><span class="cx"> macro(WeakSet)\
</span><ins>+ macro(WebGL2RenderingContext) \
+ macro(WebGLVertexArrayObject) \
</ins><span class="cx"> macro(WebSocket) \
</span><span class="cx"> macro(__defineGetter__) \
</span><span class="cx"> macro(__defineSetter__) \
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/WebCore/ChangeLog 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2016-04-05 Antoine Quint <graouts@apple.com>
+
+ [WebGL2] Turn the ENABLE_WEBGL2 flag on
+ https://bugs.webkit.org/show_bug.cgi?id=156061
+ <rdar://problem/25463193>
+
+ Reviewed by Alex Christensen.
+
+ Conditionalize the definition of the WebGL2RenderingContext and WebGLVertexArrayObject globals
+ based on the new WebGL2 runtime flag we introduced in https://webkit.org/b/156166.
+
+ Turning the ENABLE_WEBGL2 flag on caused a host of build errors which we fix here. A non-obvious
+ error was in code generated from the html/canvas/WebGL2RenderingContext.idl file which was solved
+ by updating the getBufferSubData() method to the current signature as of the March 29 Editor's
+ Draft of the WebGL 2 Specification (https://www.khronos.org/registry/webgl/specs/latest/2.0/).
+ Missing JSC headers in WebGL2RenderingContext.cpp also caused some linking errors in Release builds.
+
+ Tests: webgl/webgl-vertex-array-object-defined.html
+ webgl/webgl2-rendering-context-defined.html
+ webgl/webgl2-rendering-context-obtain.html
+
+ * Configurations/FeatureDefines.xcconfig:
+ * bindings/js/JSWebGL2RenderingContextCustom.cpp:
+ (WebCore::JSWebGL2RenderingContext::getInternalformatParameter):
+ (WebCore::JSWebGL2RenderingContext::getQueryParameter):
+ (WebCore::JSWebGL2RenderingContext::getSamplerParameter):
+ (WebCore::JSWebGL2RenderingContext::getSyncParameter):
+ (WebCore::JSWebGL2RenderingContext::getIndexedParameter):
+ (WebCore::JSWebGL2RenderingContext::getActiveUniformBlockParameter):
+ (WebCore::JSWebGL2RenderingContext::getActiveUniformBlockName):
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::is3dType):
+ * html/canvas/WebGL2RenderingContext.cpp:
+ (WebCore::WebGL2RenderingContext::getBufferSubData): Deleted.
+ * html/canvas/WebGL2RenderingContext.idl:
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::create):
+ * html/canvas/WebGLVertexArrayObject.idl:
+
</ins><span class="cx"> 2016-04-05 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Shadow DOM: :host() From The First Shadow Context Should Not Style All Shadow Context
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> ENABLE_VIEW_MODE_CSS_MEDIA = ;
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><del>-ENABLE_WEBGL2 = ;
</del><ins>+ENABLE_WEBGL2 = ENABLE_WEBGL2;
</ins><span class="cx"> ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</span><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebGL2RenderingContextCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #if ENABLE(WEBGL) && ENABLE(WEBGL2)
</span><span class="cx"> #include "JSWebGL2RenderingContext.h"
</span><span class="cx">
</span><ins>+#include <runtime/Error.h>
</ins><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "WebGL2RenderingContext.h"
</span><span class="cx">
</span><span class="lines">@@ -70,53 +71,53 @@
</span><span class="cx"> visitor.addOpaqueRoot(&wrapped());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSWebGL2RenderingContext::getInternalformatParameter(ExecState* exec)
</del><ins>+JSValue JSWebGL2RenderingContext::getInternalformatParameter(ExecState& exec)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSWebGL2RenderingContext::getQueryParameter(ExecState* exec)
</del><ins>+JSValue JSWebGL2RenderingContext::getQueryParameter(ExecState& exec)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSWebGL2RenderingContext::getSamplerParameter(ExecState* exec)
</del><ins>+JSValue JSWebGL2RenderingContext::getSamplerParameter(ExecState& exec)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSWebGL2RenderingContext::getSyncParameter(ExecState* exec)
</del><ins>+JSValue JSWebGL2RenderingContext::getSyncParameter(ExecState& exec)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSWebGL2RenderingContext::getIndexedParameter(ExecState* exec)
</del><ins>+JSValue JSWebGL2RenderingContext::getIndexedParameter(ExecState& exec)
</ins><span class="cx"> {
</span><del>- if (exec->argumentCount() != 2)
- return exec->vm().throwException(exec, createNotEnoughArgumentsError(exec));
</del><ins>+ if (exec.argumentCount() != 2)
+ return exec.vm().throwException(&exec, createNotEnoughArgumentsError(&exec));
</ins><span class="cx">
</span><span class="cx"> WebGL2RenderingContext& context = wrapped();
</span><del>- unsigned pname = exec->uncheckedArgument(0).toInt32(exec);
- if (exec->hadException())
</del><ins>+ unsigned pname = exec.uncheckedArgument(0).toInt32(&exec);
+ if (exec.hadException())
</ins><span class="cx"> return jsUndefined();
</span><del>- unsigned index = exec->uncheckedArgument(1).toInt32(exec);
- if (exec->hadException())
</del><ins>+ unsigned index = exec.uncheckedArgument(1).toInt32(&exec);
+ if (exec.hadException())
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> WebGLGetInfo info = context.getIndexedParameter(pname, index);
</span><del>- return toJS(exec, globalObject(), info);
</del><ins>+ return toJS(&exec, globalObject(), info);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSWebGL2RenderingContext::getActiveUniformBlockParameter(ExecState* exec)
</del><ins>+JSValue JSWebGL2RenderingContext::getActiveUniformBlockParameter(ExecState& exec)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSWebGL2RenderingContext::getActiveUniformBlockName(ExecState* exec)
</del><ins>+JSValue JSWebGL2RenderingContext::getActiveUniformBlockName(ExecState& exec)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> return jsUndefined();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -296,7 +296,7 @@
</span><span class="cx"> // Retain support for the legacy "webkit-3d" name.
</span><span class="cx"> return type == "webgl" || type == "experimental-webgl"
</span><span class="cx"> #if ENABLE(WEBGL2)
</span><del>- || type == "experimental-webgl2"
</del><ins>+ || type == "webgl2"
</ins><span class="cx"> #endif
</span><span class="cx"> || type == "webkit-3d";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGL2RenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx"> #include "WebGLSync.h"
</span><span class="cx"> #include "WebGLTransformFeedback.h"
</span><span class="cx"> #include "WebGLVertexArrayObject.h"
</span><ins>+#include <JavaScriptCore/GenericTypedArrayViewInlines.h>
+#include <JavaScriptCore/JSGenericTypedArrayViewInlines.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -95,13 +97,6 @@
</span><span class="cx"> UNUSED_PARAM(size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGL2RenderingContext::getBufferSubData(GC3Denum target, GC3Dint64 offset, ArrayBufferView* returnedData)
-{
- UNUSED_PARAM(target);
- UNUSED_PARAM(offset);
- UNUSED_PARAM(returnedData);
-}
-
</del><span class="cx"> void WebGL2RenderingContext::getBufferSubData(GC3Denum target, GC3Dint64 offset, ArrayBuffer* returnedData)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(target);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGL2RenderingContextidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEBGL2,
</span><ins>+ EnabledAtRuntime=WebGL2,
</ins><span class="cx"> JSCustomMarkFunction,
</span><span class="cx"> DoNotCheckConstants,
</span><span class="cx"> ] interface WebGL2RenderingContext : WebGLRenderingContextBase {
</span><span class="lines">@@ -335,8 +336,7 @@
</span><span class="cx"> // MapBufferRange, in particular its read-only and write-only modes,
</span><span class="cx"> // can not be exposed safely to JavaScript. GetBufferSubData
</span><span class="cx"> // replaces it for the purpose of fetching data back from the GPU.
</span><del>- [StrictTypeChecking] void getBufferSubData(GLenum target, GLintptr offset, ArrayBufferView returnedData);
- [StrictTypeChecking] void getBufferSubData(GLenum target, GLintptr offset, ArrayBuffer returnedData);
</del><ins>+ [StrictTypeChecking] void getBufferSubData(GLenum target, GLintptr offset, ArrayBuffer? returnedData);
</ins><span class="cx">
</span><span class="cx"> /* Framebuffer objects */
</span><span class="cx"> [StrictTypeChecking] void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> LOG(WebGL, "Create a WebGL context that looks real, but will require a policy resolution if used.");
</span><span class="cx"> std::unique_ptr<WebGLRenderingContextBase> renderingContext = nullptr;
</span><span class="cx"> #if ENABLE(WEBGL2)
</span><del>- if (type == "experimental-webgl2")
</del><ins>+ if (type == "webgl2")
</ins><span class="cx"> renderingContext = std::unique_ptr<WebGL2RenderingContext>(new WebGL2RenderingContext(canvas, attributes));
</span><span class="cx"> else
</span><span class="cx"> #endif
</span><span class="lines">@@ -427,7 +427,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebGLRenderingContextBase> renderingContext = nullptr;
</span><span class="cx"> #if ENABLE(WEBGL2)
</span><del>- if (type == "experimental-webgl2")
</del><ins>+ if (type == "webgl2")
</ins><span class="cx"> renderingContext = std::unique_ptr<WebGL2RenderingContext>(new WebGL2RenderingContext(canvas, context, attributes));
</span><span class="cx"> else
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjectidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLVertexArrayObject.idl (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLVertexArrayObject.idl 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/WebCore/html/canvas/WebGLVertexArrayObject.idl 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- Conditional=WEBGL2
</del><ins>+ Conditional=WEBGL2,
+ EnabledAtRuntime=WebGL2
</ins><span class="cx"> ] interface WebGLVertexArrayObject {
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-04-05 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [WebGL2] Turn the ENABLE_WEBGL2 flag on
+ https://bugs.webkit.org/show_bug.cgi?id=156061
+ <rdar://problem/25463193>
+
+ Reviewed by Alex Christensen.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2016-04-05 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [WebGL2] Allow enabling WebGL2 with a runtime flag
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156166
</span><span class="cx"> <rdar://problem/25526929>
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> ENABLE_VIEW_MODE_CSS_MEDIA = ;
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><del>-ENABLE_WEBGL2 = ;
</del><ins>+ENABLE_WEBGL2 = ENABLE_WEBGL2;
</ins><span class="cx"> ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</span><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-04-05 Antoine Quint <graouts@apple.com>
+
+ [WebGL2] Turn the ENABLE_WEBGL2 flag on
+ https://bugs.webkit.org/show_bug.cgi?id=156061
+ <rdar://problem/25463193>
+
+ Reviewed by Alex Christensen.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-04-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> We sometimes fail to remove outdated entry from the disk cache after revalidation and when the resource is no longer cacheable
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (199061 => 199062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-04-05 16:50:29 UTC (rev 199061)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-04-05 16:54:07 UTC (rev 199062)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> ENABLE_VIEW_MODE_CSS_MEDIA = ;
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><del>-ENABLE_WEBGL2 = ;
</del><ins>+ENABLE_WEBGL2 = ENABLE_WEBGL2;
</ins><span class="cx"> ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</span><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span></span></pre>
</div>
</div>
</body>
</html>