| Index: third_party/WebKit/Source/modules/webaudio/AudioNode.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNode.cpp b/third_party/WebKit/Source/modules/webaudio/AudioNode.cpp
|
| index 099e457ff9007575264a2b32c875d2258c00c8cf..ef366e8b1750c3772461190f7420b3ebff4fe2b4 100644
|
| --- a/third_party/WebKit/Source/modules/webaudio/AudioNode.cpp
|
| +++ b/third_party/WebKit/Source/modules/webaudio/AudioNode.cpp
|
| @@ -417,10 +417,10 @@ void AudioHandler::disableOutputsIfNecessary()
|
| // longer have any input connections. This needs to be handled more generally where
|
| // AudioNodes have a tailTime attribute. Then the AudioNode only needs to remain "active"
|
| // for tailTime seconds after there are no longer any active connections.
|
| - if (nodeType() != NodeTypeConvolver
|
| - && nodeType() != NodeTypeDelay
|
| - && nodeType() != NodeTypeBiquadFilter
|
| - && nodeType() != NodeTypeIIRFilter) {
|
| + if (getNodeType() != NodeTypeConvolver
|
| + && getNodeType() != NodeTypeDelay
|
| + && getNodeType() != NodeTypeBiquadFilter
|
| + && getNodeType() != NodeTypeIIRFilter) {
|
| m_isDisabled = true;
|
| clearInternalStateWhenDisabled();
|
| for (auto& output : m_outputs)
|
| @@ -435,7 +435,7 @@ void AudioHandler::makeConnection()
|
|
|
| #if DEBUG_AUDIONODE_REFERENCES
|
| fprintf(stderr, "%p: %2d: AudioNode::ref %3d [%3d]\n",
|
| - this, nodeType(), m_connectionRefCount, s_nodeCount[nodeType()]);
|
| + this, getNodeType(), m_connectionRefCount, s_nodeCount[getNodeType()]);
|
| #endif
|
| // See the disabling code in disableOutputsIfNecessary(). This handles
|
| // the case where a node is being re-connected after being used at least
|
| @@ -474,7 +474,7 @@ void AudioHandler::breakConnectionWithLock()
|
|
|
| #if DEBUG_AUDIONODE_REFERENCES
|
| fprintf(stderr, "%p: %2d: AudioNode::deref %3d [%3d]\n",
|
| - this, nodeType(), m_connectionRefCount, s_nodeCount[nodeType()]);
|
| + this, getNodeType(), m_connectionRefCount, s_nodeCount[getNodeType()]);
|
| #endif
|
|
|
| if (!m_connectionRefCount)
|
| @@ -512,7 +512,7 @@ unsigned AudioHandler::numberOfOutputChannels() const
|
| // This should only be called for ScriptProcessorNodes which are the only nodes where you can
|
| // have an output with 0 channels. All other nodes have have at least one output channel, so
|
| // there's no reason other nodes should ever call this function.
|
| - ASSERT_WITH_MESSAGE(1, "numberOfOutputChannels() not valid for node type %d", nodeType());
|
| + ASSERT_WITH_MESSAGE(1, "numberOfOutputChannels() not valid for node type %d", getNodeType());
|
| return 1;
|
| }
|
| // ----------------------------------------------------------------
|
| @@ -600,7 +600,7 @@ AudioNode* AudioNode::connect(AudioNode* destination, unsigned outputIndex, unsi
|
|
|
| // ScriptProcessorNodes with 0 output channels can't be connected to any destination. If there
|
| // are no output channels, what would the destination receive? Just disallow this.
|
| - if (handler().nodeType() == AudioHandler::NodeTypeJavaScript
|
| + if (handler().getNodeType() == AudioHandler::NodeTypeJavaScript
|
| && handler().numberOfOutputChannels() == 0) {
|
| exceptionState.throwDOMException(
|
| InvalidAccessError,
|
|
|