Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 3 insertions, 32 deletions

diff --git a/Source/WebCore/webaudio/AudioDestinationNode.cpp b/Source/WebCore/webaudio/AudioDestinationNode.cpp
index d2f4928..8c46b44 100644
--- a/Source/WebCore/webaudio/AudioDestinationNode.cpp
+++ b/Source/WebCore/webaudio/AudioDestinationNode.cpp
@@ -32,19 +32,16 @@
 #include "AudioContext.h"
 #include "AudioNodeInput.h"
 #include "AudioNodeOutput.h"
-#include <wtf/Threading.h>
 
 namespace WebCore {
-
-AudioDestinationNode::AudioDestinationNode(AudioContext* context)
-    : AudioNode(context, AudioDestination::hardwareSampleRate())
+    
+AudioDestinationNode::AudioDestinationNode(AudioContext* context, double sampleRate)
+    : AudioNode(context, sampleRate)
     , m_currentTime(0.0)
 {
     addInput(adoptPtr(new AudioNodeInput(this)));
     
     setType(NodeTypeDestination);
-    
-    initialize();
 }
 
 AudioDestinationNode::~AudioDestinationNode()
@@ -52,32 +49,6 @@ AudioDestinationNode::~AudioDestinationNode()
     uninitialize();
 }
 
-void AudioDestinationNode::initialize()
-{
-    if (isInitialized())
-        return;
-
-    double hardwareSampleRate = AudioDestination::hardwareSampleRate();
-#ifndef NDEBUG    
-    fprintf(stderr, ">>>> hardwareSampleRate = %f\n", hardwareSampleRate);
-#endif
-    
-    m_destination = AudioDestination::create(*this, hardwareSampleRate);
-    m_destination->start();
-    
-    AudioNode::initialize();
-}
-
-void AudioDestinationNode::uninitialize()
-{
-    if (!isInitialized())
-        return;
-
-    m_destination->stop();
-
-    AudioNode::uninitialize();
-}
-
 // The audio hardware calls us back here to gets its input stream.
 void AudioDestinationNode::provideInput(AudioBus* destinationBus, size_t numberOfFrames)
 {