Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webaudio / ChannelMergerNode.cpp

diff --git a/src/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp b/src/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
index eaba95f..31f3db5 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
+++ b/src/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
@@ -40,19 +40,18 @@ const unsigned DefaultNumberOfOutputChannels = 1;
 
 namespace blink {
 
-PassRefPtrWillBeRawPtr<ChannelMergerNode> ChannelMergerNode::create(AudioContext* context, float sampleRate, unsigned numberOfInputs)
+ChannelMergerNode* ChannelMergerNode::create(AudioContext* context, float sampleRate, unsigned numberOfInputs)
 {
     if (!numberOfInputs || numberOfInputs > AudioContext::maxNumberOfChannels())
-        return nullptr;
+        return 0;
 
-    return adoptRefWillBeNoop(new ChannelMergerNode(context, sampleRate, numberOfInputs));
+    return adoptRefCountedGarbageCollectedWillBeNoop(new ChannelMergerNode(context, sampleRate, numberOfInputs));
 }
 
 ChannelMergerNode::ChannelMergerNode(AudioContext* context, float sampleRate, unsigned numberOfInputs)
     : AudioNode(context, sampleRate)
     , m_desiredNumberOfOutputChannels(DefaultNumberOfOutputChannels)
 {
-    ScriptWrappable::init(this);
     // Create the requested number of inputs.
     for (unsigned i = 0; i < numberOfInputs; ++i)
         addInput();