<!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>[265832] 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/265832">265832</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2020-08-18 14:13:29 -0700 (Tue, 18 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>WaveShaperNode.curve setter should create a copy of the input array
https://bugs.webkit.org/show_bug.cgi?id=215615

Reviewed by Eric Carlson.

LayoutTests/imported/w3c:

Rebaseline WPT test now that all checks are passing.

* web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-copy-curve-expected.txt:

Source/WebCore:

WaveShaperNode.curve setter should create a copy of the input array, so that follow-up modifications
of the array by the JS do not impact audio processing:
- https://www.w3.org/TR/webaudio/#dom-waveshapernode-curve

No new tests, rebaselined existing test.

* Modules/webaudio/WaveShaperNode.cpp:
(WebCore::WaveShaperNode::setCurve):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestswebaudiotheaudioapithewaveshapernodeinterfacewaveshapercopycurveexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-copy-curve-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioWaveShaperNodecpp">trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (265831 => 265832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2020-08-18 20:58:32 UTC (rev 265831)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2020-08-18 21:13:29 UTC (rev 265832)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2020-08-18  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><ins>+        WaveShaperNode.curve setter should create a copy of the input array
+        https://bugs.webkit.org/show_bug.cgi?id=215615
+
+        Reviewed by Eric Carlson.
+
+        Rebaseline WPT test now that all checks are passing.
+
+        * web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-copy-curve-expected.txt:
+
+2020-08-18  Chris Dumez  <cdumez@apple.com>
+
</ins><span class="cx">         Unreviewed, rebaseline webaudio WPT tests that are marked as flaky.
</span><span class="cx"> 
</span><span class="cx">         * web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-1-chan-expected.txt:
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestswebaudiotheaudioapithewaveshapernodeinterfacewaveshapercopycurveexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-copy-curve-expected.txt (265831 => 265832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-copy-curve-expected.txt 2020-08-18 20:58:32 UTC (rev 265831)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-copy-curve-expected.txt    2020-08-18 21:13:29 UTC (rev 265832)
</span><span class="lines">@@ -4,13 +4,7 @@
</span><span class="cx"> PASS Audit report 
</span><span class="cx"> PASS > [test copying] Modifying curve should not modify WaveShaper 
</span><span class="cx"> PASS   Modifying curve array at time 0.016 did not throw an exception. 
</span><del>-FAIL X Output of WaveShaper with modified curve expected to be equal to the array [0.49996769428253174,0.5009150505065918,0.45840585231781006,0.418259859085083,0.4066271185874939,0.3590536117553711,0.33179545402526855,0.3104820251464844,0.26318126916885376,0.24366599321365356,0.21394681930541992,0.16716444492340088,0.15968090295791626,0.10723161697387695,0.08663725852966309,0.05806773900985718...] but differs in 768 places:
-       Index   Actual                  Expected
-       [0]     -1.8747980892658234e-1  4.9996769428253174e-1
-       [1]     -1.8807190656661987e-1  5.0091505050659180e-1
-       [2]     -1.6150365769863129e-1  4.5840585231781006e-1
-       [3]     -1.3641241192817688e-1  4.1825985908508301e-1
-       ...and 764 more errors. assert_true: expected true got false
-FAIL < [test copying] 1 out of 2 assertions were failed. assert_true: expected true got false
-FAIL # AUDIT TASK RUNNER FINISHED: 1 out of 1 tasks were failed. assert_true: expected true got false
</del><ins>+PASS   Output of WaveShaper with modified curve is identical to the array [-0.0756523609161377,-0.11659121513366699,-0.155839204788208,-0.20866751670837402,-0.2606172561645508,-0.2944837808609009,-0.34542036056518555,-0.4115844964981079,-0.4145416021347046,-0.5117456912994385,-0.5245202779769897,-0.5778524875640869,-0.6312663555145264,-0.6895406246185303,-0.6796438694000244,-0.8224917650222778...]. 
+PASS < [test copying] All assertions passed. (total 2 assertions) 
+PASS # AUDIT TASK RUNNER FINISHED: 1 tasks ran successfully. 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (265831 => 265832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-08-18 20:58:32 UTC (rev 265831)
+++ trunk/Source/WebCore/ChangeLog      2020-08-18 21:13:29 UTC (rev 265832)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2020-08-18  Chris Dumez  <cdumez@apple.com>
+
+        WaveShaperNode.curve setter should create a copy of the input array
+        https://bugs.webkit.org/show_bug.cgi?id=215615
+
+        Reviewed by Eric Carlson.
+
+        WaveShaperNode.curve setter should create a copy of the input array, so that follow-up modifications
+        of the array by the JS do not impact audio processing:
+        - https://www.w3.org/TR/webaudio/#dom-waveshapernode-curve
+
+        No new tests, rebaselined existing test.
+
+        * Modules/webaudio/WaveShaperNode.cpp:
+        (WebCore::WaveShaperNode::setCurve):
+
</ins><span class="cx"> 2020-08-17  Ryosuke Niwa  <rniwa@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r262381): replaceChildren should not use DeferChildrenChanged::No
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioWaveShaperNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp (265831 => 265832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp 2020-08-18 20:58:32 UTC (rev 265831)
+++ trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp    2020-08-18 21:13:29 UTC (rev 265832)
</span><span class="lines">@@ -85,6 +85,13 @@
</span><span class="cx">     if (curve && curve->length() < 2)
</span><span class="cx">         return Exception { InvalidStateError, "Length of curve array cannot be less than 2" };
</span><span class="cx"> 
</span><ins>+    if (curve) {
+        // The specification states that we should maintain an internal copy of the curve so that
+        // subsequent modifications of the contents of the array have no effect.
+        auto clonedCurve = Float32Array::create(curve->data(), curve->length());
+        curve = WTFMove(clonedCurve);
+    }
+
</ins><span class="cx">     waveShaperProcessor()->setCurve(curve.get());
</span><span class="cx">     return { };
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>