Title: [199340] trunk
- Revision
- 199340
- Author
- commit-qu...@webkit.org
- Date
- 2016-04-12 00:38:31 -0700 (Tue, 12 Apr 2016)
Log Message
Remove failing assertion in ANGLE
https://bugs.webkit.org/show_bug.cgi?id=156485
Patch by Alex Christensen <achristen...@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.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (199339 => 199340)
--- trunk/LayoutTests/ChangeLog 2016-04-12 07:29:35 UTC (rev 199339)
+++ trunk/LayoutTests/ChangeLog 2016-04-12 07:38:31 UTC (rev 199340)
@@ -1,3 +1,13 @@
+2016-04-12 Alex Christensen <achristen...@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.
+
2016-04-11 Brent Fulgham <bfulg...@apple.com>
Use WeakPtrs to avoid using deallocated Widgets and ScrollableAreas
Added: trunk/LayoutTests/fast/canvas/webgl/fragment-shader-assertion-expected.txt (0 => 199340)
--- 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)
@@ -0,0 +1,3 @@
+PASS: This test did not assert because of this expected syntax error:
+ERROR: 0:1: ',' : syntax error
+
Added: trunk/LayoutTests/fast/canvas/webgl/fragment-shader-assertion.html (0 => 199340)
--- 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)
@@ -0,0 +1,23 @@
+<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>
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (199339 => 199340)
--- 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)
@@ -1,3 +1,13 @@
+2016-04-12 Alex Christensen <achristen...@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:
+
2016-04-11 Fujii Hironori <hironori.fu...@jp.sony.com>
[CMake] Make FOLDER property INHERITED
Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.l (199339 => 199340)
--- 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)
@@ -393,7 +393,7 @@
[ \t\v\n\f\r] { }
<*><<EOF>> { yyterminate(); }
-<*>. { assert(false); return 0; }
+<*>. { return 0; }
%%
Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_lex.cpp (199339 => 199340)
--- 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)
@@ -2082,7 +2082,7 @@
YY_BREAK
case 238:
YY_RULE_SETUP
-{ assert(false); return 0; }
+{ return 0; }
YY_BREAK
case 239:
YY_RULE_SETUP
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
