<!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>[193732] branches/safari-601-branch</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/193732">193732</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-12-08 00:47:28 -0800 (Tue, 08 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/192281">r192281</a>. rdar://problem/23787092</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreModuleswebaudioPannerNodecpp">branches/safari-601-branch/Source/WebCore/Modules/webaudio/PannerNode.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreModuleswebaudioPannerNodeh">branches/safari-601-branch/Source/WebCore/Modules/webaudio/PannerNode.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestswebaudiopannerloopexpectedtxt">branches/safari-601-branch/LayoutTests/webaudio/panner-loop-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestswebaudiopannerloophtml">branches/safari-601-branch/LayoutTests/webaudio/panner-loop.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193731 => 193732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-08 08:45:47 UTC (rev 193731)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-08 08:47:28 UTC (rev 193732)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-08 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r192281.
+
+ 2015-11-10 Brent Fulgham <bfulgham@apple.com>
+
+ Crash running webaudio/panner-loop.html
+ https://bugs.webkit.org/show_bug.cgi?id=150200
+ <rdar://problem/23136282>
+
+ Reviewed by Jer Noble.
+
+ This is based on the changes in Blink r164822:
+ https://codereview.chromium.org/130003002
+
+ * webaudio/panner-loop-expected.txt: Added.
+ * webaudio/panner-loop.html: Added.
+
</ins><span class="cx"> 2015-12-02 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Unify font-variant-* with font-variant shorthand
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestswebaudiopannerloopexpectedtxtfromrev193703branchessafari60114660branchLayoutTestswebaudiopannerloopexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/webaudio/panner-loop-expected.txt (from rev 193703, branches/safari-601.1.46.60-branch/LayoutTests/webaudio/panner-loop-expected.txt) (0 => 193732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/webaudio/panner-loop-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/webaudio/panner-loop-expected.txt 2015-12-08 08:47:28 UTC (rev 193732)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Test PannerNode handling of feedback loops
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS Rendering successfully completed.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestswebaudiopannerloophtmlfromrev193703branchessafari60114660branchLayoutTestswebaudiopannerloophtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/webaudio/panner-loop.html (from rev 193703, branches/safari-601.1.46.60-branch/LayoutTests/webaudio/panner-loop.html) (0 => 193732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/webaudio/panner-loop.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/webaudio/panner-loop.html 2015-12-08 08:47:28 UTC (rev 193732)
</span><span class="lines">@@ -0,0 +1,84 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+ <head>
+ <script src="resources/audio-testing.js"></script>
+ <script src="../resources/js-test.js"></script>
+ <script src="resources/panner-model-testing.js"></script>
+ </head>
+
+ <body>
+ <div id="description"></div>
+ <div id="console"></div>
+ <script>
+ description("Test PannerNode handling of feedback loops");
+
+ // See webkit.org/b/150200
+ // See crbug.com/331446.
+
+ // Create a simple feedback loop and make sure the panner node processes it correctly.
+
+ function runTest() {
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ window.jsTestIsAsync = true;
+
+ var sampleRate = 44100;
+ var renderLengthSeconds = 1;
+
+ // Create offline audio context.
+ var context = new webkitOfflineAudioContext(2, sampleRate * renderLengthSeconds, sampleRate);
+
+ // Create nodes in graph. This is based on the test given in crbug.com/331446.
+ var source = context.createBufferSource();
+ source.buffer = createImpulseBuffer(context, sampleRate * renderLengthSeconds);
+ var activateNode = context.createGain();
+ var dry = context.createGain();
+ var wet = context.createGain();
+ var filter = context.createBiquadFilter();
+ var delay = context.createDelay();
+ var feedbackNode = context.createGain();
+ var output = context.createGain();
+
+ delay.delayTime.value = 0.1;
+ wet.gain.value = 0.5;
+ dry.gain.value = 1;
+ feedbackNode.gain.value = 0.45;
+ filter.frequency.value = 20000;
+
+ source.connect(activateNode);
+ activateNode.connect(delay);
+ activateNode.connect(dry);
+ delay.connect(filter);
+ filter.connect(feedbackNode);
+ feedbackNode.connect(delay);
+ feedbackNode.connect(wet);
+ wet.connect(output);
+ dry.connect(output);
+
+ var panner = context.createPanner();
+ panner.coneOuterGain = 0.1;
+ panner.coneOuterAngle = 180;
+ panner.coneInnerAngle = 0;
+
+ panner.connect(context.destination);
+
+ output.connect(panner);
+
+ // Render. We don't care what the output is, though.
+
+ context.oncomplete = function (event) {
+ testPassed("Rendering successfully completed.");
+ finishJSTest();
+ };
+ context.startRendering();
+ }
+
+ runTest();
+ successfullyParsed = true;
+ </script>
+
+ </body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193731 => 193732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-08 08:45:47 UTC (rev 193731)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-08 08:47:28 UTC (rev 193732)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-12-08 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r192281.
+
+ 2015-11-10 Brent Fulgham <bfulgham@apple.com>
+
+ Crash running webaudio/panner-loop.html
+ https://bugs.webkit.org/show_bug.cgi?id=150200
+ <rdar://problem/23136282>
+
+ Reviewed by Jer Noble.
+
+ Test: webaudio/panner-loop.html
+
+ This is based on the changes in Blink r164822:
+ https://codereview.chromium.org/130003002
+
+ Avoid infinitely recursing on audio nodes by keeping track of which nodes we've already
+ visited.
+
+ * Modules/webaudio/PannerNode.cpp:
+ (WebCore::PannerNode::pullInputs): Pass set of visited nodes so we don't revisit
+ nodes we've already serviced.
+ (WebCore::PannerNode::notifyAudioSourcesConnectedToNode): Accept visitedNodes argument
+ so we can avoid revisiting nodes. Check if the current node has already been visited
+ before processing it.
+ * Modules/webaudio/PannerNode.h:
+
</ins><span class="cx"> 2015-12-02 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Unify font-variant-* with font-variant shorthand
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreModuleswebaudioPannerNodecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/Modules/webaudio/PannerNode.cpp (193731 => 193732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/Modules/webaudio/PannerNode.cpp 2015-12-08 08:45:47 UTC (rev 193731)
+++ branches/safari-601-branch/Source/WebCore/Modules/webaudio/PannerNode.cpp 2015-12-08 08:47:28 UTC (rev 193732)
</span><span class="lines">@@ -88,7 +88,8 @@
</span><span class="cx"> m_connectionCount = context()->connectionCount();
</span><span class="cx">
</span><span class="cx"> // Recursively go through all nodes connected to us.
</span><del>- notifyAudioSourcesConnectedToNode(this);
</del><ins>+ HashSet<AudioNode*> visitedNodes;
+ notifyAudioSourcesConnectedToNode(this, visitedNodes);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AudioNode::pullInputs(framesToProcess);
</span><span class="lines">@@ -397,7 +398,7 @@
</span><span class="cx"> return float(distanceGain * coneGain);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PannerNode::notifyAudioSourcesConnectedToNode(AudioNode* node)
</del><ins>+void PannerNode::notifyAudioSourcesConnectedToNode(AudioNode* node, HashSet<AudioNode*>& visitedNodes)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(node);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -416,7 +417,11 @@
</span><span class="cx"> for (unsigned j = 0; j < input->numberOfRenderingConnections(); ++j) {
</span><span class="cx"> AudioNodeOutput* connectedOutput = input->renderingOutput(j);
</span><span class="cx"> AudioNode* connectedNode = connectedOutput->node();
</span><del>- notifyAudioSourcesConnectedToNode(connectedNode); // recurse
</del><ins>+ if (visitedNodes.contains(connectedNode))
+ continue;
+
+ visitedNodes.add(connectedNode);
+ notifyAudioSourcesConnectedToNode(connectedNode, visitedNodes);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreModuleswebaudioPannerNodeh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/Modules/webaudio/PannerNode.h (193731 => 193732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/Modules/webaudio/PannerNode.h 2015-12-08 08:45:47 UTC (rev 193731)
+++ branches/safari-601-branch/Source/WebCore/Modules/webaudio/PannerNode.h 2015-12-08 08:47:28 UTC (rev 193732)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "Panner.h"
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <mutex>
</span><ins>+#include <wtf/HashSet.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -139,7 +140,7 @@
</span><span class="cx">
</span><span class="cx"> // Notifies any AudioBufferSourceNodes connected to us either directly or indirectly about our existence.
</span><span class="cx"> // This is in order to handle the pitch change necessary for the doppler shift.
</span><del>- void notifyAudioSourcesConnectedToNode(AudioNode*);
</del><ins>+ void notifyAudioSourcesConnectedToNode(AudioNode*, HashSet<AudioNode*>& visitedNodes);
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<Panner> m_panner;
</span><span class="cx"> unsigned m_panningModel;
</span></span></pre>
</div>
</div>
</body>
</html>