Merge 94984

Source/WebCore/webaudio/OfflineAudioDestinationNode.cpp

 /*
  * Copyright (C) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 34 matching lines @@
     , m_renderTarget(renderTarget)
     , m_startedRendering(false)
 {
     m_renderBus = adoptPtr(new AudioBus(renderTarget->numberOfChannels(), renderQuantumSize));
     
     initialize();
 }
 
 OfflineAudioDestinationNode::~OfflineAudioDestinationNode()
 {
+    if (m_renderThread)
+        waitForThreadCompletion(m_renderThread, 0);
+    
     uninitialize();
 }
 
 void OfflineAudioDestinationNode::initialize()
 {
     if (isInitialized())
         return;
 
     AudioNode::initialize();
 }
@@ skipping 71 matching lines @@
             float* source = m_renderBus->channel(channelIndex)->data();
             float* destination = m_renderTarget->getChannelData(channelIndex)->data();
             memcpy(destination + n, source, sizeof(float) * framesAvailableToCopy);
         }
         
         n += framesAvailableToCopy;
         framesToProcess -= framesAvailableToCopy;
     }
     
     // Our work is done. Let the AudioContext know.
+    // See corresponding deref() call in notifyCompleteDispatch().
+    ref();
     callOnMainThread(notifyCompleteDispatch, this);
 }
 
 void OfflineAudioDestinationNode::notifyCompleteDispatch(void* userData)
 {
     OfflineAudioDestinationNode* destinationNode = static_cast<OfflineAudioDestinationNode*>(userData);
     ASSERT(destinationNode);
     if (!destinationNode)
         return;
 
     destinationNode->notifyComplete();
+    destinationNode->deref();
 }
 
 void OfflineAudioDestinationNode::notifyComplete()
 {
     context()->fireCompletionEvent();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)