Title: [95435] branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp
Revision
95435
Author
infe...@chromium.org
Date
2011-09-19 10:13:05 -0700 (Mon, 19 Sep 2011)

Log Message

Merge 95124
BUG=96150
Review URL: http://codereview.chromium.org/7945008

Modified Paths

Diff

Modified: branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp (95434 => 95435)


--- branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp	2011-09-19 17:12:14 UTC (rev 95434)
+++ branches/chromium/874/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp	2011-09-19 17:13:05 UTC (rev 95435)
@@ -43,6 +43,7 @@
 OfflineAudioDestinationNode::OfflineAudioDestinationNode(AudioContext* context, AudioBuffer* renderTarget)
     : AudioDestinationNode(context, renderTarget->sampleRate())
     , m_renderTarget(renderTarget)
+    , m_renderThread(0)
     , m_startedRendering(false)
 {
     m_renderBus = adoptPtr(new AudioBus(renderTarget->numberOfChannels(), renderQuantumSize));
@@ -52,9 +53,6 @@
 
 OfflineAudioDestinationNode::~OfflineAudioDestinationNode()
 {
-    if (m_renderThread)
-        waitForThreadCompletion(m_renderThread, 0);
-    
     uninitialize();
 }
 
@@ -83,6 +81,7 @@
     
     if (!m_startedRendering) {
         m_startedRendering = true;
+        ref(); // See corresponding deref() call in notifyCompleteDispatch().
         m_renderThread = createThread(OfflineAudioDestinationNode::renderEntry, this, "offline renderer");
     }
 }
@@ -146,8 +145,6 @@
     }
     
     // Our work is done. Let the AudioContext know.
-    // See corresponding deref() call in notifyCompleteDispatch().
-    ref();
     callOnMainThread(notifyCompleteDispatch, this);
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to