<!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>[161644] trunk/Source/WebCore</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/161644">161644</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 09:50:44 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CTTE in AudioContext::AutoLocker
https://bugs.webkit.org/show_bug.cgi?id=126758
Reviewed by Antti Koivisto.
* Modules/webaudio/AudioBasicInspectorNode.cpp:
(WebCore::AudioBasicInspectorNode::connect):
(WebCore::AudioBasicInspectorNode::disconnect):
* Modules/webaudio/AudioBufferSourceNode.cpp:
(WebCore::AudioBufferSourceNode::setBuffer):
* Modules/webaudio/AudioContext.cpp:
(WebCore::AudioContext::refNode):
(WebCore::AudioContext::deleteMarkedNodes):
(WebCore::AudioContext::removeMarkedSummingJunction):
* Modules/webaudio/AudioContext.h:
(WebCore::AudioContext::AutoLocker::AutoLocker):
(WebCore::AudioContext::AutoLocker::~AutoLocker):
* Modules/webaudio/AudioNode.cpp:
(WebCore::AudioNode::connect):
(WebCore::AudioNode::disconnect):
(WebCore::AudioNode::setChannelCount):
(WebCore::AudioNode::setChannelCountMode):
(WebCore::AudioNode::setChannelInterpretation):
(WebCore::AudioNode::enableOutputsIfNecessary):
* Modules/webaudio/MediaElementAudioSourceNode.cpp:
(WebCore::MediaElementAudioSourceNode::setFormat):
* Modules/webaudio/WaveShaperNode.cpp:
(WebCore::WaveShaperNode::setOversample):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioBasicInspectorNodecpp">trunk/Source/WebCore/Modules/webaudio/AudioBasicInspectorNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioBufferSourceNodecpp">trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContextcpp">trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContexth">trunk/Source/WebCore/Modules/webaudio/AudioContext.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioNodecpp">trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioMediaElementAudioSourceNodecpp">trunk/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161643 => 161644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 17:45:19 UTC (rev 161643)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 17:50:44 UTC (rev 161644)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-01-10 Anders Carlsson <andersca@apple.com>
+
+ CTTE in AudioContext::AutoLocker
+ https://bugs.webkit.org/show_bug.cgi?id=126758
+
+ Reviewed by Antti Koivisto.
+
+ * Modules/webaudio/AudioBasicInspectorNode.cpp:
+ (WebCore::AudioBasicInspectorNode::connect):
+ (WebCore::AudioBasicInspectorNode::disconnect):
+ * Modules/webaudio/AudioBufferSourceNode.cpp:
+ (WebCore::AudioBufferSourceNode::setBuffer):
+ * Modules/webaudio/AudioContext.cpp:
+ (WebCore::AudioContext::refNode):
+ (WebCore::AudioContext::deleteMarkedNodes):
+ (WebCore::AudioContext::removeMarkedSummingJunction):
+ * Modules/webaudio/AudioContext.h:
+ (WebCore::AudioContext::AutoLocker::AutoLocker):
+ (WebCore::AudioContext::AutoLocker::~AutoLocker):
+ * Modules/webaudio/AudioNode.cpp:
+ (WebCore::AudioNode::connect):
+ (WebCore::AudioNode::disconnect):
+ (WebCore::AudioNode::setChannelCount):
+ (WebCore::AudioNode::setChannelCountMode):
+ (WebCore::AudioNode::setChannelInterpretation):
+ (WebCore::AudioNode::enableOutputsIfNecessary):
+ * Modules/webaudio/MediaElementAudioSourceNode.cpp:
+ (WebCore::MediaElementAudioSourceNode::setFormat):
+ * Modules/webaudio/WaveShaperNode.cpp:
+ (WebCore::WaveShaperNode::setOversample):
+
</ins><span class="cx"> 2014-01-10 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Use element iterators more
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioBasicInspectorNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioBasicInspectorNode.cpp (161643 => 161644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioBasicInspectorNode.cpp 2014-01-10 17:45:19 UTC (rev 161643)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBasicInspectorNode.cpp 2014-01-10 17:50:44 UTC (rev 161644)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- AudioContext::AutoLocker locker(context());
</del><ins>+ AudioContext::AutoLocker locker(*context());
</ins><span class="cx">
</span><span class="cx"> AudioNode::connect(destination, outputIndex, inputIndex, ec);
</span><span class="cx"> updatePullStatus();
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- AudioContext::AutoLocker locker(context());
</del><ins>+ AudioContext::AutoLocker locker(*context());
</ins><span class="cx">
</span><span class="cx"> AudioNode::disconnect(outputIndex, ec);
</span><span class="cx"> updatePullStatus();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioBufferSourceNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp (161643 => 161644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp 2014-01-10 17:45:19 UTC (rev 161643)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp 2014-01-10 17:50:44 UTC (rev 161644)
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> // The context must be locked since changing the buffer can re-configure the number of channels that are output.
</span><del>- AudioContext::AutoLocker contextLocker(context());
</del><ins>+ AudioContext::AutoLocker contextLocker(*context());
</ins><span class="cx">
</span><span class="cx"> // This synchronizes with process().
</span><span class="cx"> MutexLocker processLocker(m_processLock);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (161643 => 161644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2014-01-10 17:45:19 UTC (rev 161643)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2014-01-10 17:50:44 UTC (rev 161644)
</span><span class="lines">@@ -634,7 +634,7 @@
</span><span class="cx"> void AudioContext::refNode(AudioNode* node)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- AutoLocker locker(this);
</del><ins>+ AutoLocker locker(*this);
</ins><span class="cx">
</span><span class="cx"> node->ref(AudioNode::RefTypeConnection);
</span><span class="cx"> m_referencedNodes.append(node);
</span><span class="lines">@@ -853,7 +853,7 @@
</span><span class="cx"> // Protect this object from being deleted before we release the mutex locked by AutoLocker.
</span><span class="cx"> Ref<AudioContext> protect(*this);
</span><span class="cx"> {
</span><del>- AutoLocker locker(this);
</del><ins>+ AutoLocker locker(*this);
</ins><span class="cx">
</span><span class="cx"> while (size_t n = m_nodesToDelete.size()) {
</span><span class="cx"> AudioNode* node = m_nodesToDelete[n - 1];
</span><span class="lines">@@ -885,7 +885,7 @@
</span><span class="cx"> void AudioContext::removeMarkedSummingJunction(AudioSummingJunction* summingJunction)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- AutoLocker locker(this);
</del><ins>+ AutoLocker locker(*this);
</ins><span class="cx"> m_dirtySummingJunctions.remove(summingJunction);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.h (161643 => 161644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2014-01-10 17:45:19 UTC (rev 161643)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2014-01-10 17:50:44 UTC (rev 161644)
</span><span class="lines">@@ -203,20 +203,20 @@
</span><span class="cx">
</span><span class="cx"> class AutoLocker {
</span><span class="cx"> public:
</span><del>- AutoLocker(AudioContext* context)
</del><ins>+ explicit AutoLocker(AudioContext& context)
</ins><span class="cx"> : m_context(context)
</span><span class="cx"> {
</span><del>- ASSERT(context);
- context->lock(m_mustReleaseLock);
</del><ins>+ m_context.lock(m_mustReleaseLock);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~AutoLocker()
</span><span class="cx"> {
</span><span class="cx"> if (m_mustReleaseLock)
</span><del>- m_context->unlock();
</del><ins>+ m_context.unlock();
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> private:
</span><del>- AudioContext* m_context;
</del><ins>+ AudioContext& m_context;
</ins><span class="cx"> bool m_mustReleaseLock;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -248,7 +248,6 @@
</span><span class="cx">
</span><span class="cx"> static unsigned s_hardwareContextCount;
</span><span class="cx">
</span><del>-
</del><span class="cx"> // Restrictions to change default behaviors.
</span><span class="cx"> enum BehaviorRestrictionFlags {
</span><span class="cx"> NoRestrictions = 0,
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp (161643 => 161644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp 2014-01-10 17:45:19 UTC (rev 161643)
+++ trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp 2014-01-10 17:50:44 UTC (rev 161644)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> void AudioNode::connect(AudioNode* destination, unsigned outputIndex, unsigned inputIndex, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- AudioContext::AutoLocker locker(context());
</del><ins>+ AudioContext::AutoLocker locker(*context());
</ins><span class="cx">
</span><span class="cx"> if (!destination) {
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> void AudioNode::connect(AudioParam* param, unsigned outputIndex, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- AudioContext::AutoLocker locker(context());
</del><ins>+ AudioContext::AutoLocker locker(*context());
</ins><span class="cx">
</span><span class="cx"> if (!param) {
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> void AudioNode::disconnect(unsigned outputIndex, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- AudioContext::AutoLocker locker(context());
</del><ins>+ AudioContext::AutoLocker locker(*context());
</ins><span class="cx">
</span><span class="cx"> // Sanity check input and output indices.
</span><span class="cx"> if (outputIndex >= numberOfOutputs()) {
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> void AudioNode::setChannelCount(unsigned long channelCount, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- AudioContext::AutoLocker locker(context());
</del><ins>+ AudioContext::AutoLocker locker(*context());
</ins><span class="cx">
</span><span class="cx"> if (channelCount > 0 && channelCount <= AudioContext::maxNumberOfChannels()) {
</span><span class="cx"> if (m_channelCount != channelCount) {
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> void AudioNode::setChannelCountMode(const String& mode, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- AudioContext::AutoLocker locker(context());
</del><ins>+ AudioContext::AutoLocker locker(*context());
</ins><span class="cx">
</span><span class="cx"> ChannelCountMode oldMode = m_channelCountMode;
</span><span class="cx">
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> void AudioNode::setChannelInterpretation(const String& interpretation, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- AudioContext::AutoLocker locker(context());
</del><ins>+ AudioContext::AutoLocker locker(*context());
</ins><span class="cx">
</span><span class="cx"> if (interpretation == "speakers")
</span><span class="cx"> m_channelInterpretation = AudioBus::Speakers;
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_isDisabled && m_connectionRefCount > 0) {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- AudioContext::AutoLocker locker(context());
</del><ins>+ AudioContext::AutoLocker locker(*context());
</ins><span class="cx">
</span><span class="cx"> m_isDisabled = false;
</span><span class="cx"> for (unsigned i = 0; i < m_outputs.size(); ++i)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioMediaElementAudioSourceNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp (161643 => 161644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp 2014-01-10 17:45:19 UTC (rev 161643)
+++ trunk/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp 2014-01-10 17:50:44 UTC (rev 161644)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> // The context must be locked when changing the number of output channels.
</span><del>- AudioContext::AutoLocker contextLocker(context());
</del><ins>+ AudioContext::AutoLocker contextLocker(*context());
</ins><span class="cx">
</span><span class="cx"> // Do any necesssary re-configuration to the output's number of channels.
</span><span class="cx"> output(0)->setNumberOfChannels(numberOfChannels);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioWaveShaperNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp (161643 => 161644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp 2014-01-10 17:45:19 UTC (rev 161643)
+++ trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp 2014-01-10 17:50:44 UTC (rev 161644)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> // Synchronize with any graph changes or changes to channel configuration.
</span><del>- AudioContext::AutoLocker contextLocker(context());
</del><ins>+ AudioContext::AutoLocker contextLocker(*context());
</ins><span class="cx">
</span><span class="cx"> if (type == "none")
</span><span class="cx"> waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSampleNone);
</span></span></pre>
</div>
</div>
</body>
</html>