<!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>[176259] 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/176259">176259</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-18 08:31:36 -0800 (Tue, 18 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>HRTFDatabaseLoader is not an absolute condition to run audioContext
https://bugs.webkit.org/show_bug.cgi?id=138829
Reviewed by Jer Noble.
This patch is a port of the following Blink revision by
<keonho07.kim@samsung.com>:
<https://src.chromium.org/viewvc/blink?revision=167887&view=revision>
* Modules/webaudio/AudioContext.cpp:
(WebCore::AudioContext::AudioContext):
(WebCore::AudioContext::isRunnable): Deleted.
* Modules/webaudio/AudioContext.h:
(WebCore::AudioContext::hrtfDatabaseLoader): Deleted.
* Modules/webaudio/AudioDestinationNode.cpp:
(WebCore::AudioDestinationNode::render):
* Modules/webaudio/OfflineAudioDestinationNode.cpp:
(WebCore::OfflineAudioDestinationNode::offlineRender):
* Modules/webaudio/PannerNode.cpp:
(WebCore::PannerNode::PannerNode):
(WebCore::PannerNode::process):
(WebCore::PannerNode::initialize):
(WebCore::PannerNode::setPanningModel):
* Modules/webaudio/PannerNode.h:
* Modules/webaudio/RealtimeAnalyser.cpp:
* Modules/webaudio/RealtimeAnalyser.h:
* platform/audio/HRTFDatabaseLoader.cpp:
(WebCore::HRTFDatabaseLoader::createAndLoadAsynchronouslyIfNecessary):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreModuleswebaudioAudioDestinationNodecpp">trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioOfflineAudioDestinationNodecpp">trunk/Source/WebCore/Modules/webaudio/OfflineAudioDestinationNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioPannerNodecpp">trunk/Source/WebCore/Modules/webaudio/PannerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioPannerNodeh">trunk/Source/WebCore/Modules/webaudio/PannerNode.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioRealtimeAnalysercpp">trunk/Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioRealtimeAnalyserh">trunk/Source/WebCore/Modules/webaudio/RealtimeAnalyser.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioHRTFDatabaseLoadercpp">trunk/Source/WebCore/platform/audio/HRTFDatabaseLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176258 => 176259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-18 16:09:46 UTC (rev 176258)
+++ trunk/Source/WebCore/ChangeLog 2014-11-18 16:31:36 UTC (rev 176259)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-11-18 Philippe Normand <pnormand@igalia.com>
+
+ HRTFDatabaseLoader is not an absolute condition to run audioContext
+ https://bugs.webkit.org/show_bug.cgi?id=138829
+
+ Reviewed by Jer Noble.
+
+ This patch is a port of the following Blink revision by
+ <keonho07.kim@samsung.com>:
+ <https://src.chromium.org/viewvc/blink?revision=167887&view=revision>
+
+ * Modules/webaudio/AudioContext.cpp:
+ (WebCore::AudioContext::AudioContext):
+ (WebCore::AudioContext::isRunnable): Deleted.
+ * Modules/webaudio/AudioContext.h:
+ (WebCore::AudioContext::hrtfDatabaseLoader): Deleted.
+ * Modules/webaudio/AudioDestinationNode.cpp:
+ (WebCore::AudioDestinationNode::render):
+ * Modules/webaudio/OfflineAudioDestinationNode.cpp:
+ (WebCore::OfflineAudioDestinationNode::offlineRender):
+ * Modules/webaudio/PannerNode.cpp:
+ (WebCore::PannerNode::PannerNode):
+ (WebCore::PannerNode::process):
+ (WebCore::PannerNode::initialize):
+ (WebCore::PannerNode::setPanningModel):
+ * Modules/webaudio/PannerNode.h:
+ * Modules/webaudio/RealtimeAnalyser.cpp:
+ * Modules/webaudio/RealtimeAnalyser.h:
+ * platform/audio/HRTFDatabaseLoader.cpp:
+ (WebCore::HRTFDatabaseLoader::createAndLoadAsynchronouslyIfNecessary):
+
</ins><span class="cx"> 2014-11-18 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r176218.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (176258 => 176259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2014-11-18 16:09:46 UTC (rev 176258)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2014-11-18 16:31:36 UTC (rev 176259)
</span><span class="lines">@@ -142,12 +142,6 @@
</span><span class="cx"> constructCommon();
</span><span class="cx">
</span><span class="cx"> m_destinationNode = DefaultAudioDestinationNode::create(this);
</span><del>-
- // This sets in motion an asynchronous loading mechanism on another thread.
- // We can check m_hrtfDatabaseLoader->isLoaded() to find out whether or not it has been fully loaded.
- // It's not that useful to have a callback function for this since the audio thread automatically starts rendering on the graph
- // when this has finished (see AudioDestinationNode).
- m_hrtfDatabaseLoader = HRTFDatabaseLoader::createAndLoadAsynchronouslyIfNecessary(sampleRate());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Constructor for offline (non-realtime) rendering.
</span><span class="lines">@@ -167,9 +161,6 @@
</span><span class="cx"> {
</span><span class="cx"> constructCommon();
</span><span class="cx">
</span><del>- // FIXME: the passed in sampleRate MUST match the hardware sample-rate since HRTFDatabaseLoader is a singleton.
- m_hrtfDatabaseLoader = HRTFDatabaseLoader::createAndLoadAsynchronouslyIfNecessary(sampleRate);
-
</del><span class="cx"> // Create a new destination for offline rendering.
</span><span class="cx"> m_renderTarget = AudioBuffer::create(numberOfChannels, numberOfFrames, sampleRate);
</span><span class="cx"> m_destinationNode = OfflineAudioDestinationNode::create(this, m_renderTarget.get());
</span><span class="lines">@@ -288,15 +279,6 @@
</span><span class="cx"> return m_isInitialized;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AudioContext::isRunnable() const
-{
- if (!isInitialized())
- return false;
-
- // Check with the HRTF spatialization system to see if it's finished loading.
- return m_hrtfDatabaseLoader->isLoaded();
-}
-
</del><span class="cx"> void AudioContext::stopDispatch(void* userData)
</span><span class="cx"> {
</span><span class="cx"> AudioContext* context = reinterpret_cast<AudioContext*>(userData);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.h (176258 => 176259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2014-11-18 16:09:46 UTC (rev 176258)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2014-11-18 16:31:36 UTC (rev 176259)
</span><span class="lines">@@ -87,11 +87,6 @@
</span><span class="cx">
</span><span class="cx"> bool isOfflineContext() { return m_isOfflineContext; }
</span><span class="cx">
</span><del>- // Returns true when initialize() was called AND all asynchronous initialization has completed.
- bool isRunnable() const;
-
- HRTFDatabaseLoader* hrtfDatabaseLoader() const { return m_hrtfDatabaseLoader.get(); }
-
</del><span class="cx"> // Document notification
</span><span class="cx"> virtual void stop() override;
</span><span class="cx">
</span><span class="lines">@@ -343,9 +338,6 @@
</span><span class="cx">
</span><span class="cx"> // Only accessed in the audio thread.
</span><span class="cx"> Vector<AudioNode*> m_deferredFinishDerefList;
</span><del>-
- // HRTF Database loader
- RefPtr<HRTFDatabaseLoader> m_hrtfDatabaseLoader;
</del><span class="cx">
</span><span class="cx"> // EventTarget
</span><span class="cx"> virtual void refEventTarget() override { ref(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioDestinationNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.cpp (176258 => 176259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.cpp 2014-11-18 16:09:46 UTC (rev 176258)
+++ trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.cpp 2014-11-18 16:31:36 UTC (rev 176259)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> context()->setAudioThread(currentThread());
</span><span class="cx">
</span><del>- if (!context()->isRunnable()) {
</del><ins>+ if (!context()->isInitialized()) {
</ins><span class="cx"> destinationBus->zero();
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioOfflineAudioDestinationNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/OfflineAudioDestinationNode.cpp (176258 => 176259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/OfflineAudioDestinationNode.cpp 2014-11-18 16:09:46 UTC (rev 176258)
+++ trunk/Source/WebCore/Modules/webaudio/OfflineAudioDestinationNode.cpp 2014-11-18 16:31:36 UTC (rev 176259)
</span><span class="lines">@@ -101,7 +101,12 @@
</span><span class="cx"> ASSERT(m_renderBus.get());
</span><span class="cx"> if (!m_renderBus.get())
</span><span class="cx"> return;
</span><del>-
</del><ins>+
+ bool isAudioContextInitialized = context()->isInitialized();
+ ASSERT(isAudioContextInitialized);
+ if (!isAudioContextInitialized)
+ return;
+
</ins><span class="cx"> bool channelsMatch = m_renderBus->numberOfChannels() == m_renderTarget->numberOfChannels();
</span><span class="cx"> ASSERT(channelsMatch);
</span><span class="cx"> if (!channelsMatch)
</span><span class="lines">@@ -112,15 +117,6 @@
</span><span class="cx"> if (!isRenderBusAllocated)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Synchronize with HRTFDatabaseLoader.
- // The database must be loaded before we can proceed.
- HRTFDatabaseLoader* loader = context()->hrtfDatabaseLoader();
- ASSERT(loader);
- if (!loader)
- return;
-
- loader->waitForLoaderThreadCompletion();
-
</del><span class="cx"> // Break up the render target into smaller "render quantize" sized pieces.
</span><span class="cx"> // Render until we're finished.
</span><span class="cx"> size_t framesToProcess = m_renderTarget->length();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioPannerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/PannerNode.cpp (176258 => 176259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/PannerNode.cpp 2014-11-18 16:09:46 UTC (rev 176258)
+++ trunk/Source/WebCore/Modules/webaudio/PannerNode.cpp 2014-11-18 16:31:36 UTC (rev 176259)
</span><span class="lines">@@ -52,6 +52,9 @@
</span><span class="cx"> , m_lastGain(-1.0)
</span><span class="cx"> , m_connectionCount(0)
</span><span class="cx"> {
</span><ins>+ // Load the HRTF database asynchronously so we don't block the Javascript thread while creating the HRTF database.
+ m_hrtfDatabaseLoader = HRTFDatabaseLoader::createAndLoadAsynchronouslyIfNecessary(context->sampleRate());
+
</ins><span class="cx"> addInput(std::make_unique<AudioNodeInput>(this));
</span><span class="cx"> addOutput(std::make_unique<AudioNodeOutput>(this, 2));
</span><span class="cx">
</span><span class="lines">@@ -101,12 +104,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AudioBus* source = input(0)->bus();
</span><del>-
</del><span class="cx"> if (!source) {
</span><span class="cx"> destination->zero();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // HRTFDatabase should be loaded before proceeding for offline audio context when panningModel() is "HRTF".
+ if (panningModel() == "HRTF" && !m_hrtfDatabaseLoader->isLoaded()) {
+ if (context()->isOfflineContext())
+ m_hrtfDatabaseLoader->waitForLoaderThreadCompletion();
+ else {
+ destination->zero();
+ return;
+ }
+ }
+
</ins><span class="cx"> // The audio thread can't block on this lock, so we use std::try_to_lock instead.
</span><span class="cx"> std::unique_lock<std::mutex> lock(m_pannerMutex, std::try_to_lock);
</span><span class="cx"> if (!lock.owns_lock()) {
</span><span class="lines">@@ -144,7 +156,7 @@
</span><span class="cx"> if (isInitialized())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_panner = Panner::create(m_panningModel, sampleRate(), context()->hrtfDatabaseLoader());
</del><ins>+ m_panner = Panner::create(m_panningModel, sampleRate(), m_hrtfDatabaseLoader.get());
</ins><span class="cx">
</span><span class="cx"> AudioNode::initialize();
</span><span class="cx"> }
</span><span class="lines">@@ -199,7 +211,7 @@
</span><span class="cx"> // This synchronizes with process().
</span><span class="cx"> std::lock_guard<std::mutex> lock(m_pannerMutex);
</span><span class="cx">
</span><del>- m_panner = Panner::create(model, sampleRate(), context()->hrtfDatabaseLoader());
</del><ins>+ m_panner = Panner::create(model, sampleRate(), m_hrtfDatabaseLoader.get());
</ins><span class="cx"> m_panningModel = model;
</span><span class="cx"> }
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioPannerNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/PannerNode.h (176258 => 176259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/PannerNode.h 2014-11-18 16:09:46 UTC (rev 176258)
+++ trunk/Source/WebCore/Modules/webaudio/PannerNode.h 2014-11-18 16:31:36 UTC (rev 176259)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "Cone.h"
</span><span class="cx"> #include "Distance.h"
</span><span class="cx"> #include "FloatPoint3D.h"
</span><ins>+#include "HRTFDatabaseLoader.h"
</ins><span class="cx"> #include "Panner.h"
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <mutex>
</span><span class="lines">@@ -154,6 +155,9 @@
</span><span class="cx"> ConeEffect m_coneEffect;
</span><span class="cx"> float m_lastGain;
</span><span class="cx">
</span><ins>+ // HRTF Database loader
+ RefPtr<HRTFDatabaseLoader> m_hrtfDatabaseLoader;
+
</ins><span class="cx"> unsigned m_connectionCount;
</span><span class="cx">
</span><span class="cx"> // Synchronize process() and setPanningModel() which can change the panner.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioRealtimeAnalysercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp (176258 => 176259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp 2014-11-18 16:09:46 UTC (rev 176258)
+++ trunk/Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp 2014-11-18 16:31:36 UTC (rev 176259)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "AudioBus.h"
</span><span class="cx"> #include "AudioUtilities.h"
</span><del>-#include "FFTFrame.h"
</del><span class="cx"> #include "VectorMath.h"
</span><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <complex>
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioRealtimeAnalyserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/RealtimeAnalyser.h (176258 => 176259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/RealtimeAnalyser.h 2014-11-18 16:09:46 UTC (rev 176258)
+++ trunk/Source/WebCore/Modules/webaudio/RealtimeAnalyser.h 2014-11-18 16:31:36 UTC (rev 176259)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #define RealtimeAnalyser_h
</span><span class="cx">
</span><span class="cx"> #include "AudioArray.h"
</span><ins>+#include "FFTFrame.h"
</ins><span class="cx"> #include <memory>
</span><span class="cx"> #include <runtime/Float32Array.h>
</span><span class="cx"> #include <runtime/Uint8Array.h>
</span><span class="lines">@@ -35,7 +36,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class AudioBus;
</span><del>-class FFTFrame;
</del><span class="cx">
</span><span class="cx"> class RealtimeAnalyser {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(RealtimeAnalyser);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioHRTFDatabaseLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/HRTFDatabaseLoader.cpp (176258 => 176259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/HRTFDatabaseLoader.cpp 2014-11-18 16:09:46 UTC (rev 176258)
+++ trunk/Source/WebCore/platform/audio/HRTFDatabaseLoader.cpp 2014-11-18 16:31:36 UTC (rev 176259)
</span><span class="lines">@@ -49,9 +49,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- RefPtr<HRTFDatabaseLoader> loader;
-
- loader = loaderMap().get(sampleRate);
</del><ins>+ RefPtr<HRTFDatabaseLoader> loader = loaderMap().get(sampleRate);
</ins><span class="cx"> if (loader) {
</span><span class="cx"> ASSERT(sampleRate == loader->databaseSampleRate());
</span><span class="cx"> return loader;
</span></span></pre>
</div>
</div>
</body>
</html>