Implement BaseAudioContext

third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp

Index: third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
diff --git a/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp b/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
index b2f54cefc4b5ea1c6800d20057155562928d7221..cbf6b6d9f1ea68b679b431b6c5fb574fc6b5de6e 100644
--- a/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
@@ -31,9 +31,9 @@
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
-#include "modules/webaudio/AbstractAudioContext.h"
 #include "modules/webaudio/AudioNodeInput.h"
 #include "modules/webaudio/AudioNodeOutput.h"
+#include "modules/webaudio/BaseAudioContext.h"
 
 
 namespace blink {
@@ -94,7 +94,7 @@ void ChannelMergerHandler::process(size_t framesToProcess)
 void ChannelMergerHandler::setChannelCount(unsigned long channelCount, ExceptionState& exceptionState)
 {
     ASSERT(isMainThread());
-    AbstractAudioContext::AutoLocker locker(context());
+    BaseAudioContext::AutoLocker locker(context());
 
     // channelCount must be 1.
     if (channelCount != 1) {
@@ -107,7 +107,7 @@ void ChannelMergerHandler::setChannelCount(unsigned long channelCount, Exception
 void ChannelMergerHandler::setChannelCountMode(const String& mode, ExceptionState& exceptionState)
 {
     ASSERT(isMainThread());
-    AbstractAudioContext::AutoLocker locker(context());
+    BaseAudioContext::AutoLocker locker(context());
 
     // channcelCountMode must be 'explicit'.
     if (mode != "explicit") {
@@ -119,15 +119,15 @@ void ChannelMergerHandler::setChannelCountMode(const String& mode, ExceptionStat
 
 // ----------------------------------------------------------------
 
-ChannelMergerNode::ChannelMergerNode(AbstractAudioContext& context, float sampleRate, unsigned numberOfInputs)
+ChannelMergerNode::ChannelMergerNode(BaseAudioContext& context, float sampleRate, unsigned numberOfInputs)
     : AudioNode(context)
 {
     setHandler(ChannelMergerHandler::create(*this, sampleRate, numberOfInputs));
 }
 
-ChannelMergerNode* ChannelMergerNode::create(AbstractAudioContext& context, float sampleRate, unsigned numberOfInputs)
+ChannelMergerNode* ChannelMergerNode::create(BaseAudioContext& context, float sampleRate, unsigned numberOfInputs)
 {
-    if (!numberOfInputs || numberOfInputs > AbstractAudioContext::maxNumberOfChannels())
+    if (!numberOfInputs || numberOfInputs > BaseAudioContext::maxNumberOfChannels())
         return nullptr;
     return new ChannelMergerNode(context, sampleRate, numberOfInputs);
 }