<!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>[207632] 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/207632">207632</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 12:17:06 -0700 (Thu, 20 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve error message when passing a null ArrayBuffer to bufferData()
https://bugs.webkit.org/show_bug.cgi?id=163745
Reviewed by Dean Jackson.
Source/WebCore:
Test: fast/canvas/webgl/bufferData-nullable-array-buffer-view.html
Update the idl file to accept a nullable ArrayBuffer, and throw
the relevant error with a more helpful error string.
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::bufferData):
* html/canvas/WebGLRenderingContextBase.h:
* html/canvas/WebGLRenderingContextBase.idl:
LayoutTests:
* fast/canvas/webgl/bufferData-nullable-array-buffer-view-expected.txt: Added.
* fast/canvas/webgl/bufferData-nullable-array-buffer-view.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="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseh">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseidl">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvaswebglbufferDatanullablearraybufferviewexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/bufferData-nullable-array-buffer-view-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebglbufferDatanullablearraybufferviewhtml">trunk/LayoutTests/fast/canvas/webgl/bufferData-nullable-array-buffer-view.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207631 => 207632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-20 19:15:59 UTC (rev 207631)
+++ trunk/LayoutTests/ChangeLog 2016-10-20 19:17:06 UTC (rev 207632)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-20 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Improve error message when passing a null ArrayBuffer to bufferData()
+ https://bugs.webkit.org/show_bug.cgi?id=163745
+
+ Reviewed by Dean Jackson.
+
+ * fast/canvas/webgl/bufferData-nullable-array-buffer-view-expected.txt: Added.
+ * fast/canvas/webgl/bufferData-nullable-array-buffer-view.html: Added.
+
</ins><span class="cx"> 2016-10-20 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop searching for first-letter containers at multi-column boundary.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglbufferDatanullablearraybufferviewexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/bufferData-nullable-array-buffer-view-expected.txt (0 => 207632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/bufferData-nullable-array-buffer-view-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/bufferData-nullable-array-buffer-view-expected.txt 2016-10-20 19:17:06 UTC (rev 207632)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+CONSOLE MESSAGE: line 19: WebGL: INVALID_VALUE: bufferData: null data
+PASS context.getError() is context.NO_ERROR
+PASS context.getError() is context.NO_ERROR
+PASS context.getError() is context.NO_ERROR
+PASS undefined did not throw exception.
+PASS context.getError() is context.NO_ERROR
+PASS undefined did not throw exception.
+PASS context.getError() is context.INVALID_VALUE
+PASS context.getError() is context.NO_ERROR
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglbufferDatanullablearraybufferviewhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/bufferData-nullable-array-buffer-view.html (0 => 207632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/bufferData-nullable-array-buffer-view.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/bufferData-nullable-array-buffer-view.html 2016-10-20 19:17:06 UTC (rev 207632)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+var canvas = document.createElement("canvas");
+canvas.width = 2;
+canvas.height = 2;
+var context = canvas.getContext("webgl");
+shouldBe("context.getError()", "context.NO_ERROR");
+var buffer = context.createBuffer();
+shouldBe("context.getError()", "context.NO_ERROR");
+context.bindBuffer(context.ARRAY_BUFFER, buffer);
+shouldBe("context.getError()", "context.NO_ERROR");
+shouldNotThrow(context.bufferData(context.ARRAY_BUFFER, new ArrayBuffer(10), context.STATIC_DRAW));
+shouldBe("context.getError()", "context.NO_ERROR");
+shouldNotThrow(context.bufferData(context.ARRAY_BUFFER, null, context.STATIC_DRAW));
+shouldBe("context.getError()", "context.INVALID_VALUE");
+shouldBe("context.getError()", "context.NO_ERROR");
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207631 => 207632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-20 19:15:59 UTC (rev 207631)
+++ trunk/Source/WebCore/ChangeLog 2016-10-20 19:17:06 UTC (rev 207632)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-10-20 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Improve error message when passing a null ArrayBuffer to bufferData()
+ https://bugs.webkit.org/show_bug.cgi?id=163745
+
+ Reviewed by Dean Jackson.
+
+ Test: fast/canvas/webgl/bufferData-nullable-array-buffer-view.html
+
+ Update the idl file to accept a nullable ArrayBuffer, and throw
+ the relevant error with a more helpful error string.
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::bufferData):
+ * html/canvas/WebGLRenderingContextBase.h:
+ * html/canvas/WebGLRenderingContextBase.idl:
+
</ins><span class="cx"> 2016-10-20 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop searching for first-letter containers at multi-column boundary.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (207631 => 207632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-10-20 19:15:59 UTC (rev 207631)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-10-20 19:17:06 UTC (rev 207632)
</span><span class="lines">@@ -1075,15 +1075,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBuffer& data, GC3Denum usage, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage, ExceptionCode&)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><ins>+ if (!data) {
+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "bufferData", "null data");
+ return;
+ }
</ins><span class="cx"> WebGLBuffer* buffer = validateBufferDataParameters("bufferData", target, usage);
</span><span class="cx"> if (!buffer)
</span><span class="cx"> return;
</span><span class="cx"> if (!isErrorGeneratedOnOutOfBoundsAccesses()) {
</span><del>- if (!buffer->associateBufferData(&data)) {
</del><ins>+ if (!buffer->associateBufferData(data)) {
</ins><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "bufferData", "invalid buffer");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1090,7 +1094,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_context->moveErrorsToSyntheticErrorList();
</span><del>- m_context->bufferData(target, data.byteLength(), data.data(), usage);
</del><ins>+ m_context->bufferData(target, data->byteLength(), data->data(), usage);
</ins><span class="cx"> if (m_context->moveErrorsToSyntheticErrorList()) {
</span><span class="cx"> // The bufferData function failed. Tell the buffer it doesn't have the data it thinks it does.
</span><span class="cx"> buffer->disassociateBufferData();
</span><span class="lines">@@ -1097,15 +1101,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBufferView& data, GC3Denum usage, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage, ExceptionCode&)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><ins>+ if (!data) {
+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "bufferData", "null data");
+ return;
+ }
</ins><span class="cx"> WebGLBuffer* buffer = validateBufferDataParameters("bufferData", target, usage);
</span><span class="cx"> if (!buffer)
</span><span class="cx"> return;
</span><span class="cx"> if (!isErrorGeneratedOnOutOfBoundsAccesses()) {
</span><del>- if (!buffer->associateBufferData(&data)) {
</del><ins>+ if (!buffer->associateBufferData(data.get())) {
</ins><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "bufferData", "invalid buffer");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1112,7 +1120,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_context->moveErrorsToSyntheticErrorList();
</span><del>- m_context->bufferData(target, data.byteLength(), data.baseAddress(), usage);
</del><ins>+ m_context->bufferData(target, data->byteLength(), data->baseAddress(), usage);
</ins><span class="cx"> if (m_context->moveErrorsToSyntheticErrorList()) {
</span><span class="cx"> // The bufferData function failed. Tell the buffer it doesn't have the data it thinks it does.
</span><span class="cx"> buffer->disassociateBufferData();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h (207631 => 207632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2016-10-20 19:15:59 UTC (rev 207631)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2016-10-20 19:17:06 UTC (rev 207632)
</span><span class="lines">@@ -139,8 +139,8 @@
</span><span class="cx"> void blendFuncSeparate(GC3Denum srcRGB, GC3Denum dstRGB, GC3Denum srcAlpha, GC3Denum dstAlpha);
</span><span class="cx">
</span><span class="cx"> void bufferData(GC3Denum target, long long size, GC3Denum usage, ExceptionCode&);
</span><del>- void bufferData(GC3Denum target, ArrayBuffer& data, GC3Denum usage, ExceptionCode&);
- void bufferData(GC3Denum target, ArrayBufferView& data, GC3Denum usage, ExceptionCode&);
</del><ins>+ void bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage, ExceptionCode&);
+ void bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage, ExceptionCode&);
</ins><span class="cx"> void bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data, ExceptionCode&);
</span><span class="cx"> void bufferSubData(GC3Denum target, long long offset, RefPtr<ArrayBufferView>&& data, ExceptionCode&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl (207631 => 207632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl 2016-10-20 19:15:59 UTC (rev 207631)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl 2016-10-20 19:17:06 UTC (rev 207632)
</span><span class="lines">@@ -484,8 +484,8 @@
</span><span class="cx"> void blendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
</span><span class="cx"> void blendFunc(GLenum sfactor, GLenum dfactor);
</span><span class="cx"> void blendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
</span><del>- [MayThrowLegacyException] void bufferData(GLenum target, ArrayBuffer data, GLenum usage);
- [MayThrowLegacyException] void bufferData(GLenum target, ArrayBufferView data, GLenum usage);
</del><ins>+ [MayThrowLegacyException] void bufferData(GLenum target, ArrayBuffer? data, GLenum usage);
+ [MayThrowLegacyException] void bufferData(GLenum target, ArrayBufferView? data, GLenum usage);
</ins><span class="cx"> [MayThrowLegacyException] void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
</span><span class="cx"> [MayThrowLegacyException] void bufferSubData(GLenum target, GLintptr offset, ArrayBuffer? data);
</span><span class="cx"> [MayThrowLegacyException] void bufferSubData(GLenum target, GLintptr offset, ArrayBufferView? data);
</span></span></pre>
</div>
</div>
</body>
</html>