| Index: Source/modules/webaudio/AudioNode.cpp
|
| diff --git a/Source/modules/webaudio/AudioNode.cpp b/Source/modules/webaudio/AudioNode.cpp
|
| index e0944f61c1b992c3346ab73d686424c362e6130b..7e4b075f9982e2393778829bf504217bcce8e920 100644
|
| --- a/Source/modules/webaudio/AudioNode.cpp
|
| +++ b/Source/modules/webaudio/AudioNode.cpp
|
| @@ -28,7 +28,6 @@
|
|
|
| #include "modules/webaudio/AudioNode.h"
|
|
|
| -#include "bindings/v8/ExceptionMessages.h"
|
| #include "bindings/v8/ExceptionState.h"
|
| #include "core/dom/ExceptionCode.h"
|
| #include "modules/webaudio/AudioContext.h"
|
| @@ -178,10 +177,7 @@ void AudioNode::connect(AudioNode* destination, unsigned outputIndex, unsigned i
|
| if (!destination) {
|
| exceptionState.throwDOMException(
|
| SyntaxError,
|
| - ExceptionMessages::failedToExecute(
|
| - "connect",
|
| - "AudioNode",
|
| - "invalid destination node."));
|
| + "invalid destination node.");
|
| return;
|
| }
|
|
|
| @@ -189,30 +185,21 @@ void AudioNode::connect(AudioNode* destination, unsigned outputIndex, unsigned i
|
| if (outputIndex >= numberOfOutputs()) {
|
| exceptionState.throwDOMException(
|
| IndexSizeError,
|
| - ExceptionMessages::failedToExecute(
|
| - "connect",
|
| - "AudioNode",
|
| - "output index (" + String::number(outputIndex) + ") exceeds number of outputs (" + String::number(numberOfOutputs()) + ")."));
|
| + "output index (" + String::number(outputIndex) + ") exceeds number of outputs (" + String::number(numberOfOutputs()) + ").");
|
| return;
|
| }
|
|
|
| if (destination && inputIndex >= destination->numberOfInputs()) {
|
| exceptionState.throwDOMException(
|
| IndexSizeError,
|
| - ExceptionMessages::failedToExecute(
|
| - "connect",
|
| - "AudioNode",
|
| - "input index (" + String::number(inputIndex) + ") exceeds number of inputs (" + String::number(destination->numberOfInputs()) + ")."));
|
| + "input index (" + String::number(inputIndex) + ") exceeds number of inputs (" + String::number(destination->numberOfInputs()) + ").");
|
| return;
|
| }
|
|
|
| if (context() != destination->context()) {
|
| exceptionState.throwDOMException(
|
| SyntaxError,
|
| - ExceptionMessages::failedToExecute(
|
| - "connect",
|
| - "AudioNode",
|
| - "cannot connect to a destination belonging to a different audio context."));
|
| + "cannot connect to a destination belonging to a different audio context.");
|
| return;
|
| }
|
|
|
| @@ -232,30 +219,21 @@ void AudioNode::connect(AudioParam* param, unsigned outputIndex, ExceptionState&
|
| if (!param) {
|
| exceptionState.throwDOMException(
|
| SyntaxError,
|
| - ExceptionMessages::failedToExecute(
|
| - "connect",
|
| - "AudioNode",
|
| - "invalid AudioParam."));
|
| + "invalid AudioParam.");
|
| return;
|
| }
|
|
|
| if (outputIndex >= numberOfOutputs()) {
|
| exceptionState.throwDOMException(
|
| IndexSizeError,
|
| - ExceptionMessages::failedToExecute(
|
| - "connect",
|
| - "AudioNode",
|
| - "output index (" + String::number(outputIndex) + ") exceeds number of outputs (" + String::number(numberOfOutputs()) + ")."));
|
| + "output index (" + String::number(outputIndex) + ") exceeds number of outputs (" + String::number(numberOfOutputs()) + ").");
|
| return;
|
| }
|
|
|
| if (context() != param->context()) {
|
| exceptionState.throwDOMException(
|
| SyntaxError,
|
| - ExceptionMessages::failedToExecute(
|
| - "connect",
|
| - "AudioNode",
|
| - "cannot connect to an AudioParam belonging to a different audio context."));
|
| + "cannot connect to an AudioParam belonging to a different audio context.");
|
| return;
|
| }
|
|
|
| @@ -272,10 +250,7 @@ void AudioNode::disconnect(unsigned outputIndex, ExceptionState& exceptionState)
|
| if (outputIndex >= numberOfOutputs()) {
|
| exceptionState.throwDOMException(
|
| IndexSizeError,
|
| - ExceptionMessages::failedToExecute(
|
| - "disconnect",
|
| - "AudioNode",
|
| - "output index (" + String::number(outputIndex) + ") exceeds number of outputs (" + String::number(numberOfOutputs()) + ")."));
|
| + "output index (" + String::number(outputIndex) + ") exceeds number of outputs (" + String::number(numberOfOutputs()) + ").");
|
| return;
|
| }
|
|
|
| @@ -302,12 +277,7 @@ void AudioNode::setChannelCount(unsigned long channelCount, ExceptionState& exce
|
| } else {
|
| exceptionState.throwDOMException(
|
| NotSupportedError,
|
| - ExceptionMessages::failedToSet(
|
| - "channelCount",
|
| - "AudioNode",
|
| - "channel count (" + String::number(channelCount)
|
| - + ") must be between 1 and "
|
| - + String::number(AudioContext::maxNumberOfChannels()) + "."));
|
| + "channel count (" + String::number(channelCount) + ") must be between 1 and " + String::number(AudioContext::maxNumberOfChannels()) + ".");
|
| }
|
| }
|
|
|
| @@ -341,10 +311,7 @@ void AudioNode::setChannelCountMode(const String& mode, ExceptionState& exceptio
|
| } else {
|
| exceptionState.throwDOMException(
|
| InvalidStateError,
|
| - ExceptionMessages::failedToSet(
|
| - "channelCountMode",
|
| - "AudioNode",
|
| - "invalid mode '" + mode + "'; must be 'max', 'clamped-max', or 'explicit'."));
|
| + "invalid mode '" + mode + "'; must be 'max', 'clamped-max', or 'explicit'.");
|
| }
|
|
|
| if (m_channelCountMode != oldMode)
|
| @@ -375,10 +342,7 @@ void AudioNode::setChannelInterpretation(const String& interpretation, Exception
|
| } else {
|
| exceptionState.throwDOMException(
|
| InvalidStateError,
|
| - ExceptionMessages::failedToSet(
|
| - "channelInterpretation",
|
| - "AudioNode",
|
| - "invalid interpretation '" + interpretation + "'; must be 'speakers' or 'discrete'."));
|
| + "invalid interpretation '" + interpretation + "'; must be 'speakers' or 'discrete'.");
|
| }
|
| }
|
|
|
|
|