<!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>[202617] 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/202617">202617</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-06-29 03:19:36 -0700 (Wed, 29 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Throw exceptions for invalid number of channels for ConvolverNode
<https://webkit.org/b/159238>
<rdar://problem/27020410>
Reviewed by Brent Fulgham.
Source/WebCore:
Fix based on a Blink change (patch by <rtoy@chromium.org>):
<https://chromium.googlesource.com/chromium/src.git/+/0cc26bbb7175aec77910d0b47faf9f8c8a640fe5>
Test: webaudio/convolver-channels.html
* Modules/webaudio/ConvolverNode.cpp:
(WebCore::ConvolverNode::setBuffer): Throw an exception for
anything but 1, 2 or 4 channels.
LayoutTests:
Test based on a Blink change (patch by <rtoy@chromium.org>):
<https://chromium.googlesource.com/chromium/src.git/+/0cc26bbb7175aec77910d0b47faf9f8c8a640fe5>
compatibility.js based on a Blink change (patch by <rtoy@google.com>):
<https://chromium.googlesource.com/chromium/src.git/+/f846f5a461d1fcdbe5152898576c125058079ed1>
* webaudio/convolver-channels-expected.txt: Added.
* webaudio/convolver-channels.html: Added.
* webaudio/resources/compatibility.js: 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="#trunkSourceWebCoreModuleswebaudioConvolverNodecpp">trunk/Source/WebCore/Modules/webaudio/ConvolverNode.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebaudioconvolverchannelsexpectedtxt">trunk/LayoutTests/webaudio/convolver-channels-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebaudioconvolverchannelshtml">trunk/LayoutTests/webaudio/convolver-channels.html</a></li>
<li><a href="#trunkLayoutTestswebaudioresourcescompatibilityjs">trunk/LayoutTests/webaudio/resources/compatibility.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202616 => 202617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-29 07:23:51 UTC (rev 202616)
+++ trunk/LayoutTests/ChangeLog 2016-06-29 10:19:36 UTC (rev 202617)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-06-29 David Kilzer <ddkilzer@apple.com>
+
+ Throw exceptions for invalid number of channels for ConvolverNode
+ <https://webkit.org/b/159238>
+ <rdar://problem/27020410>
+
+ Reviewed by Brent Fulgham.
+
+ Test based on a Blink change (patch by <rtoy@chromium.org>):
+ <https://chromium.googlesource.com/chromium/src.git/+/0cc26bbb7175aec77910d0b47faf9f8c8a640fe5>
+
+ compatibility.js based on a Blink change (patch by <rtoy@google.com>):
+ <https://chromium.googlesource.com/chromium/src.git/+/f846f5a461d1fcdbe5152898576c125058079ed1>
+
+ * webaudio/convolver-channels-expected.txt: Added.
+ * webaudio/convolver-channels.html: Added.
+ * webaudio/resources/compatibility.js: Added.
+
</ins><span class="cx"> 2016-06-28 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: Add accessibility tests for MathML operators
</span></span></pre></div>
<a id="trunkLayoutTestswebaudioconvolverchannelsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webaudio/convolver-channels-expected.txt (0 => 202617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webaudio/convolver-channels-expected.txt (rev 0)
+++ trunk/LayoutTests/webaudio/convolver-channels-expected.txt 2016-06-29 10:19:36 UTC (rev 202617)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+Test Supported Number of Channels for ConvolverNode
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS ConvolverNode with buffer of 1 channels did not throw exception.
+PASS ConvolverNode with buffer of 2 channels did not throw exception.
+PASS ConvolverNode with buffer of 3 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 4 channels did not throw exception.
+PASS ConvolverNode with buffer of 5 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 6 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 7 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 8 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 9 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 10 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 11 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 12 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 13 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 14 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 15 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 16 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 17 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 18 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 19 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 20 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 21 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 22 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 23 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 24 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 25 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 26 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 27 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 28 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 29 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 30 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 31 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 32 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestswebaudioconvolverchannelshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webaudio/convolver-channels.html (0 => 202617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webaudio/convolver-channels.html (rev 0)
+++ trunk/LayoutTests/webaudio/convolver-channels.html 2016-06-29 10:19:36 UTC (rev 202617)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../resources/js-test.js"></script>
+<script src="resources/compatibility.js"></script>
+<script src="resources/audio-testing.js"></script>
+<title>Test Supported Number of Channels for ConvolverNode</title>
+</head>
+<body>
+<script>
+description("Test Supported Number of Channels for ConvolverNode");
+window.jsTestIsAsync = true;
+
+function runTest() {
+ // Just need a context to create nodes on, so any allowed length and rate is ok.
+ var context = new OfflineAudioContext(1, 1, 48000);
+
+ for (var count = 1; count <= 32; ++count) {
+ var convolver = context.createConvolver();
+ var buffer = context.createBuffer(count, 1, context.sampleRate);
+ var message = "ConvolverNode with buffer of " + count + " channels";
+
+ if (count == 1 || count == 2 || count == 4) {
+ // These are the only valid channel counts for the buffer.
+ shouldNotThrow(function () {
+ convolver.buffer = buffer;
+ }, message);
+ } else {
+ shouldThrow(function() {
+ convolver.buffer = buffer;
+ }, "'Error: NotSupportedError: DOM Exception 9'", message);
+ }
+ }
+
+ finishJSTest();
+}
+
+runTest();
+successfullyParsed = true;
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestswebaudioresourcescompatibilityjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webaudio/resources/compatibility.js (0 => 202617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webaudio/resources/compatibility.js (rev 0)
+++ trunk/LayoutTests/webaudio/resources/compatibility.js 2016-06-29 10:19:36 UTC (rev 202617)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+// This will prevent work to update tests to use unprefixed objects in
+// the future. It wll also make it possible to bisect builds using
+// a WebKit that only supports prefixed objects.
+
+if (window.hasOwnProperty('webkitAudioContext') && !window.hasOwnProperty('AudioContext')) {
+ window.AudioContext = webkitAudioContext;
+ window.OfflineAudioContext = webkitOfflineAudioContext;
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202616 => 202617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-29 07:23:51 UTC (rev 202616)
+++ trunk/Source/WebCore/ChangeLog 2016-06-29 10:19:36 UTC (rev 202617)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-06-29 David Kilzer <ddkilzer@apple.com>
+
+ Throw exceptions for invalid number of channels for ConvolverNode
+ <https://webkit.org/b/159238>
+ <rdar://problem/27020410>
+
+ Reviewed by Brent Fulgham.
+
+ Fix based on a Blink change (patch by <rtoy@chromium.org>):
+ <https://chromium.googlesource.com/chromium/src.git/+/0cc26bbb7175aec77910d0b47faf9f8c8a640fe5>
+
+ Test: webaudio/convolver-channels.html
+
+ * Modules/webaudio/ConvolverNode.cpp:
+ (WebCore::ConvolverNode::setBuffer): Throw an exception for
+ anything but 1, 2 or 4 channels.
+
</ins><span class="cx"> 2016-06-29 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r198782, r201043): [image-decoders] Flickering with some animated gif
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioConvolverNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/ConvolverNode.cpp (202616 => 202617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/ConvolverNode.cpp 2016-06-29 07:23:51 UTC (rev 202616)
+++ trunk/Source/WebCore/Modules/webaudio/ConvolverNode.cpp 2016-06-29 10:19:36 UTC (rev 202617)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010, Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2016, Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -131,11 +132,14 @@
</span><span class="cx"> unsigned numberOfChannels = buffer->numberOfChannels();
</span><span class="cx"> size_t bufferLength = buffer->length();
</span><span class="cx">
</span><del>- // The current implementation supports up to four channel impulse responses, which are interpreted as true-stereo (see Reverb class).
- bool isBufferGood = numberOfChannels > 0 && numberOfChannels <= 4 && bufferLength;
- ASSERT(isBufferGood);
- if (!isBufferGood)
</del><ins>+ // The current implementation supports only 1-, 2-, or 4-channel impulse responses, with the
+ // 4-channel response being interpreted as true-stereo (see Reverb class).
+ bool isChannelCountGood = numberOfChannels == 1 || numberOfChannels == 2 || numberOfChannels == 4;
+
+ if (!isChannelCountGood) {
+ ec = NOT_SUPPORTED_ERR;
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Wrap the AudioBuffer by an AudioBus. It's an efficient pointer set and not a memcpy().
</span><span class="cx"> // This memory is simply used in the Reverb constructor and no reference to it is kept for later use in that class.
</span></span></pre>
</div>
</div>
</body>
</html>