<!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>[207634] 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/207634">207634</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 12:52:16 -0700 (Thu, 20 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Passing a number as the pixel parameter to texImage2D() doesn't thrown an exception
https://bugs.webkit.org/show_bug.cgi?id=163715
Reviewed by Darin Adler.
Source/WebCore:
Enable strict type checking for typed arrays in the bindings, similarly
do what we do for other wrapper types, as per Web IDL.
No new tests, updated existing tests.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation):
(GenerateParametersCheck):
LayoutTests:
Update existing tests now that we throw a TypeError when passing an unexpected
type for a parameter where we expect a typed array.
* fast/canvas/webgl/script-tests/texImageTest.js:
* fast/canvas/webgl/texImageTest-expected.txt:
* webgl/1.0.2/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebglscriptteststexImageTestjs">trunk/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebgltexImageTestexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebgl102resourceswebgl_test_filesconformancetexturesteximagewithinvaliddatahtml">trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207633 => 207634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-20 19:48:01 UTC (rev 207633)
+++ trunk/LayoutTests/ChangeLog 2016-10-20 19:52:16 UTC (rev 207634)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-20 Chris Dumez <cdumez@apple.com>
+
+ Passing a number as the pixel parameter to texImage2D() doesn't thrown an exception
+ https://bugs.webkit.org/show_bug.cgi?id=163715
+
+ Reviewed by Darin Adler.
+
+ Update existing tests now that we throw a TypeError when passing an unexpected
+ type for a parameter where we expect a typed array.
+
+ * fast/canvas/webgl/script-tests/texImageTest.js:
+ * fast/canvas/webgl/texImageTest-expected.txt:
+ * webgl/1.0.2/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html:
+
</ins><span class="cx"> 2016-10-20 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking media/modern-media-controls/media-controller/media-controller-resize.html as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglscriptteststexImageTestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js (207633 => 207634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js 2016-10-20 19:48:01 UTC (rev 207633)
+++ trunk/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js 2016-10-20 19:52:16 UTC (rev 207634)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> shouldThrow("context.texSubImage2D(context.TEXTURE_2D)");
</span><span class="cx"> shouldBeUndefined("context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, null)");
</span><del>-shouldBeUndefined("context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, 0)"); // We do not do strict type checking on ArrayBufferView.
</del><ins>+shouldThrow("context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, 0)");
</ins><span class="cx"> shouldThrow("context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, context.UNSIGNED_BYTE, 0)");
</span><span class="cx"> shouldBeUndefined("context.pixelStorei(context.UNPACK_FLIP_Y_WEBGL, false)");
</span><span class="cx"> shouldBeUndefined("context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, context.RGBA, context.UNSIGNED_BYTE, imageData)");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebgltexImageTestexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt (207633 => 207634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt 2016-10-20 19:48:01 UTC (rev 207633)
+++ trunk/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt 2016-10-20 19:52:16 UTC (rev 207634)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> PASS context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, context.RGBA, context.UNSIGNED_BYTE, video) is undefined.
</span><span class="cx"> PASS context.texSubImage2D(context.TEXTURE_2D) threw exception TypeError: Not enough arguments.
</span><span class="cx"> PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, null) is undefined.
</span><del>-PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, 0) is undefined.
</del><ins>+PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, 0, context.RGBA, context.UNSIGNED_BYTE, 0) threw exception TypeError: Argument 9 ('pixels') to WebGLRenderingContextBase.texSubImage2D must be an instance of ArrayBufferView.
</ins><span class="cx"> PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, 0, context.UNSIGNED_BYTE, 0) threw exception TypeError: Type error.
</span><span class="cx"> PASS context.pixelStorei(context.UNPACK_FLIP_Y_WEBGL, false) is undefined.
</span><span class="cx"> PASS context.texSubImage2D(context.TEXTURE_2D, 0, 10, 20, context.RGBA, context.UNSIGNED_BYTE, imageData) is undefined.
</span></span></pre></div>
<a id="trunkLayoutTestswebgl102resourceswebgl_test_filesconformancetexturesteximagewithinvaliddatahtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html (207633 => 207634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html 2016-10-20 19:48:01 UTC (rev 207633)
+++ trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/conformance/textures/tex-image-with-invalid-data.html 2016-10-20 19:52:16 UTC (rev 207634)
</span><span class="lines">@@ -89,18 +89,17 @@
</span><span class="cx"> },
</span><span class="cx"> gl.INVALID_OPERATION);
</span><span class="cx">
</span><del>-// We do not do strict type checking for ArrayBufferView type.
</del><span class="cx"> test("Passing texImage2D parameter data of Number type should generate an INVALID_OPERATION",
</span><span class="cx"> function () {
</span><span class="cx"> gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 64, 64, 0, gl.RGBA, gl.UNSIGNED_BYTE, 42);
</span><span class="cx"> },
</span><del>- gl.INVALID_OPERATION);
</del><ins>+ "exception");
</ins><span class="cx">
</span><span class="cx"> test("Passing texImage2D parameter data of String type should generate an INVALID_OPERATION",
</span><span class="cx"> function () {
</span><span class="cx"> gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 64, 64, 0, gl.RGBA, gl.UNSIGNED_BYTE, "not a buffer");
</span><span class="cx"> },
</span><del>- gl.INVALID_OPERATION);
</del><ins>+ "exception");
</ins><span class="cx"> test("Passing a buffer not large enough to texSubImage2D should generate an INVALID_OPERATION",
</span><span class="cx"> function () {
</span><span class="cx"> var tooSmall = new Uint8Array(64);
</span><span class="lines">@@ -112,13 +111,13 @@
</span><span class="cx"> function () {
</span><span class="cx"> gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 64, 64, gl.RGBA, gl.UNSIGNED_BYTE, 42);
</span><span class="cx"> },
</span><del>- gl.INVALID_VALUE);
</del><ins>+ "exception");
</ins><span class="cx">
</span><span class="cx"> test("Passing texSubImage2D parameter data of String type should generate an INVALID_VALUE",
</span><span class="cx"> function () {
</span><span class="cx"> gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 64, 64, gl.RGBA, gl.UNSIGNED_BYTE, "not a buffer");
</span><span class="cx"> },
</span><del>- gl.INVALID_VALUE);
</del><ins>+ "exception");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> var successfullyParsed = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207633 => 207634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-20 19:48:01 UTC (rev 207633)
+++ trunk/Source/WebCore/ChangeLog 2016-10-20 19:52:16 UTC (rev 207634)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-10-20 Chris Dumez <cdumez@apple.com>
+
+ Passing a number as the pixel parameter to texImage2D() doesn't thrown an exception
+ https://bugs.webkit.org/show_bug.cgi?id=163715
+
+ Reviewed by Darin Adler.
+
+ Enable strict type checking for typed arrays in the bindings, similarly
+ do what we do for other wrapper types, as per Web IDL.
+
+ No new tests, updated existing tests.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ (GenerateParametersCheck):
+
</ins><span class="cx"> 2016-10-20 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve error message when passing a null ArrayBuffer to bufferData()
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (207633 => 207634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-20 19:48:01 UTC (rev 207633)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-20 19:52:16 UTC (rev 207634)
</span><span class="lines">@@ -3444,7 +3444,7 @@
</span><span class="cx"> my $shouldPassByReference = ShouldPassWrapperByReference($attribute->signature, $interface);
</span><span class="cx">
</span><span class="cx"> my ($nativeValue, $mayThrowException) = JSValueToNative($interface, $attribute->signature, "value", $attribute->signature->extendedAttributes->{Conditional}, "&state", "state", "thisObject");
</span><del>- if (!$shouldPassByReference && $codeGenerator->IsWrapperType($type)) {
</del><ins>+ if (!$shouldPassByReference && ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type))) {
</ins><span class="cx"> $implIncludes{"<runtime/Error.h>"} = 1;
</span><span class="cx"> push(@implContent, " " . GetNativeTypeFromSignature($interface, $attribute->signature) . " nativeValue = nullptr;\n");
</span><span class="cx"> push(@implContent, " if (!value.isUndefinedOrNull()) {\n");
</span><span class="lines">@@ -4312,7 +4312,7 @@
</span><span class="cx"> die "Variadic parameter is already handled here" if $parameter->isVariadic;
</span><span class="cx"> my $argumentLookupMethod = $parameter->isOptional ? "argument" : "uncheckedArgument";
</span><span class="cx">
</span><del>- if (!$shouldPassByReference && $codeGenerator->IsWrapperType($type)) {
</del><ins>+ if (!$shouldPassByReference && ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type))) {
</ins><span class="cx"> $implIncludes{"<runtime/Error.h>"} = 1;
</span><span class="cx"> my $checkedArgument = "state->$argumentLookupMethod($argumentIndex)";
</span><span class="cx"> my $uncheckedArgument = "state->uncheckedArgument($argumentIndex)";
</span></span></pre>
</div>
</div>
</body>
</html>