<!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>[199340] 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/199340">199340</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-12 00:38:31 -0700 (Tue, 12 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove failing assertion in ANGLE
https://bugs.webkit.org/show_bug.cgi?id=156485
Patch by Alex Christensen <achristensen@webkit.org> on 2016-04-12
Reviewed by Dean Jackson.
Source/ThirdParty/ANGLE:
* src/compiler/translator/glslang.l:
* src/compiler/translator/glslang_lex.cpp:
LayoutTests:
* fast/canvas/webgl/fragment-shader-assertion-expected.txt: Added.
* fast/canvas/webgl/fragment-shader-assertion.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEsrccompilertranslatorglslangl">trunk/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.l</a></li>
<li><a href="#trunkSourceThirdPartyANGLEsrccompilertranslatorglslang_lexcpp">trunk/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_lex.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvaswebglfragmentshaderassertionexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/fragment-shader-assertion-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebglfragmentshaderassertionhtml">trunk/LayoutTests/fast/canvas/webgl/fragment-shader-assertion.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199339 => 199340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-04-12 07:29:35 UTC (rev 199339)
+++ trunk/LayoutTests/ChangeLog        2016-04-12 07:38:31 UTC (rev 199340)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-04-12 Alex Christensen <achristensen@webkit.org>
+
+ Remove failing assertion in ANGLE
+ https://bugs.webkit.org/show_bug.cgi?id=156485
+
+ Reviewed by Dean Jackson.
+
+ * fast/canvas/webgl/fragment-shader-assertion-expected.txt: Added.
+ * fast/canvas/webgl/fragment-shader-assertion.html: Added.
+
</ins><span class="cx"> 2016-04-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Use WeakPtrs to avoid using deallocated Widgets and ScrollableAreas
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglfragmentshaderassertionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/fragment-shader-assertion-expected.txt (0 => 199340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/fragment-shader-assertion-expected.txt         (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/fragment-shader-assertion-expected.txt        2016-04-12 07:38:31 UTC (rev 199340)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS: This test did not assert because of this expected syntax error:
+ERROR: 0:1: ',' : syntax error
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglfragmentshaderassertionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/fragment-shader-assertion.html (0 => 199340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/fragment-shader-assertion.html         (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/fragment-shader-assertion.html        2016-04-12 07:38:31 UTC (rev 199340)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<html>
+<head>
+<script>
+if (window.testRunner)
+        testRunner.dumpAsText();
+
+function runTest() {
+ var canvas = document.getElementById("myCanvas");
+ var gl = canvas.getContext("webgl");
+ var vertexShader = gl.createShader(gl.VERTEX_SHADER);
+ gl.shaderSource(vertexShader, "void main() { vec4 x; vec4 y = vec4(1.0+x.,1.0,0.0,1.0); }");
+ gl.compileShader(vertexShader);
+
+ document.getElementById("result").innerText = "PASS: This test did not assert because of this expected syntax error:\n" + gl.getShaderInfoLog(vertexShader);
+}
+
+</script>
+</head>
+<body onload="runTest()">
+<canvas id="myCanvas"></canvas>
+<div id="result">FAIL: Test did not run</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (199339 => 199340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog        2016-04-12 07:29:35 UTC (rev 199339)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog        2016-04-12 07:38:31 UTC (rev 199340)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-04-12 Alex Christensen <achristensen@webkit.org>
+
+ Remove failing assertion in ANGLE
+ https://bugs.webkit.org/show_bug.cgi?id=156485
+
+ Reviewed by Dean Jackson.
+
+ * src/compiler/translator/glslang.l:
+ * src/compiler/translator/glslang_lex.cpp:
+
</ins><span class="cx"> 2016-04-11 Fujii Hironori <Hironori.Fujii@jp.sony.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Make FOLDER property INHERITED
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEsrccompilertranslatorglslangl"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.l (199339 => 199340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.l        2016-04-12 07:29:35 UTC (rev 199339)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.l        2016-04-12 07:38:31 UTC (rev 199340)
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx">
</span><span class="cx"> [ \t\v\n\f\r] { }
</span><span class="cx"> <*><<EOF>> { yyterminate(); }
</span><del>-<*>. { assert(false); return 0; }
</del><ins>+<*>. { return 0; }
</ins><span class="cx">
</span><span class="cx"> %%
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEsrccompilertranslatorglslang_lexcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_lex.cpp (199339 => 199340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_lex.cpp        2016-04-12 07:29:35 UTC (rev 199339)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_lex.cpp        2016-04-12 07:38:31 UTC (rev 199340)
</span><span class="lines">@@ -2082,7 +2082,7 @@
</span><span class="cx">         YY_BREAK
</span><span class="cx"> case 238:
</span><span class="cx"> YY_RULE_SETUP
</span><del>-{ assert(false); return 0; }
</del><ins>+{ return 0; }
</ins><span class="cx">         YY_BREAK
</span><span class="cx"> case 239:
</span><span class="cx"> YY_RULE_SETUP
</span></span></pre>
</div>
</div>
</body>
</html>