Changeset 95124 in webkit

Timestamp:

Sep 14, 2011 2:39:34 PM (13 years ago)

Author:

crogers@google.com

Message:

Address lifetime issues in OfflineAudioDestinationNode (take 2)
​https://bugs.webkit.org/show_bug.cgi?id=68111

Reviewed by Kenneth Russell.

No new tests. This fixes existing layout tests.

• webaudio/OfflineAudioDestinationNode.cpp:

(WebCore::OfflineAudioDestinationNode::OfflineAudioDestinationNode):
(WebCore::OfflineAudioDestinationNode::~OfflineAudioDestinationNode):
(WebCore::OfflineAudioDestinationNode::startRendering):
(WebCore::OfflineAudioDestinationNode::render):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• webaudio/OfflineAudioDestinationNode.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-14  Chris Rogers  <crogers@google.com>
+
+        Address lifetime issues in OfflineAudioDestinationNode (take 2)
+        https://bugs.webkit.org/show_bug.cgi?id=68111
+
+        Reviewed by Kenneth Russell.
+
+        No new tests.  This fixes existing layout tests.
+
+        * webaudio/OfflineAudioDestinationNode.cpp:
+        (WebCore::OfflineAudioDestinationNode::OfflineAudioDestinationNode):
+        (WebCore::OfflineAudioDestinationNode::~OfflineAudioDestinationNode):
+        (WebCore::OfflineAudioDestinationNode::startRendering):
+        (WebCore::OfflineAudioDestinationNode::render):
+
 2011-09-14  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp

@@ -44 +44 @@
     : AudioDestinationNode(context, renderTarget->sampleRate())
     , m_renderTarget(renderTarget)
+    , m_renderThread(0)
     , m_startedRendering(false)
 {
@@ -53 +54 @@
 OfflineAudioDestinationNode::~OfflineAudioDestinationNode()
 {
-    if (m_renderThread)
-        waitForThreadCompletion(m_renderThread, 0);
-    
     uninitialize();
 }
@@ -84 +82 @@
     if (!m_startedRendering) {
         m_startedRendering = true;
+        ref(); // See corresponding deref() call in notifyCompleteDispatch().
         m_renderThread = createThread(OfflineAudioDestinationNode::renderEntry, this, "offline renderer");
     }
@@ -147 +146 @@
     
     // Our work is done. Let the AudioContext know.
-    // See corresponding deref() call in notifyCompleteDispatch().
-    ref();
     callOnMainThread(notifyCompleteDispatch, this);
 }