| 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 ecdecdbc15be26daa6a123ea6b339d1358b5f79b..c19aad88290b1589553c8f3d3c496300fdd52c26 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,13 +119,13 @@ void ChannelMergerHandler::setChannelCountMode(const String& mode, ExceptionStat
|
|
|
| // ----------------------------------------------------------------
|
|
|
| -ChannelMergerNode::ChannelMergerNode(AbstractAudioContext& context, unsigned numberOfInputs)
|
| +ChannelMergerNode::ChannelMergerNode(BaseAudioContext& context, unsigned numberOfInputs)
|
| : AudioNode(context)
|
| {
|
| setHandler(ChannelMergerHandler::create(*this, context.sampleRate(), numberOfInputs));
|
| }
|
|
|
| -ChannelMergerNode* ChannelMergerNode::create(AbstractAudioContext& context, ExceptionState& exceptionState)
|
| +ChannelMergerNode* ChannelMergerNode::create(BaseAudioContext& context, ExceptionState& exceptionState)
|
| {
|
| DCHECK(isMainThread());
|
|
|
| @@ -133,7 +133,7 @@ ChannelMergerNode* ChannelMergerNode::create(AbstractAudioContext& context, Exce
|
| return create(context, 6, exceptionState);
|
| }
|
|
|
| -ChannelMergerNode* ChannelMergerNode::create(AbstractAudioContext& context, unsigned numberOfInputs, ExceptionState& exceptionState)
|
| +ChannelMergerNode* ChannelMergerNode::create(BaseAudioContext& context, unsigned numberOfInputs, ExceptionState& exceptionState)
|
| {
|
| DCHECK(isMainThread());
|
|
|
| @@ -142,7 +142,7 @@ ChannelMergerNode* ChannelMergerNode::create(AbstractAudioContext& context, unsi
|
| return nullptr;
|
| }
|
|
|
| - if (!numberOfInputs || numberOfInputs > AbstractAudioContext::maxNumberOfChannels()) {
|
| + if (!numberOfInputs || numberOfInputs > BaseAudioContext::maxNumberOfChannels()) {
|
| exceptionState.throwDOMException(
|
| IndexSizeError,
|
| ExceptionMessages::indexOutsideRange<size_t>(
|
| @@ -150,7 +150,7 @@ ChannelMergerNode* ChannelMergerNode::create(AbstractAudioContext& context, unsi
|
| numberOfInputs,
|
| 1,
|
| ExceptionMessages::InclusiveBound,
|
| - AbstractAudioContext::maxNumberOfChannels(),
|
| + BaseAudioContext::maxNumberOfChannels(),
|
| ExceptionMessages::InclusiveBound));
|
| return nullptr;
|
| }
|
|
|