Revert CL 2242573002

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/webaudio/StereoPannerNode.h"
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "modules/webaudio/AudioNodeInput.h"
 #include "modules/webaudio/AudioNodeOutput.h"
 #include "modules/webaudio/BaseAudioContext.h"
 #include "platform/audio/StereoPanner.h"
 #include "wtf/MathExtras.h"
 
 namespace blink {
 
 StereoPannerHandler::StereoPannerHandler(AudioNode& node, float sampleRate, AudioParamHandler& pan)
     : AudioHandler(NodeTypeStereoPanner, node, sampleRate)
     , m_pan(pan)
     , m_sampleAccuratePanValues(ProcessingSizeInFrames)
 {
     addInput();
     addOutput(2);
 
     // The node-specific default mixing rules declare that StereoPannerNode
     // can handle mono to stereo and stereo to stereo conversion.
     m_channelCount = 2;
-    setInternalChannelCountMode(ClampedMax);
-    setInternalChannelInterpretation(AudioBus::Speakers);
+    m_channelCountMode = ClampedMax;
+    m_channelInterpretation = AudioBus::Speakers;
 
     initialize();
 }
 
 PassRefPtr<StereoPannerHandler> StereoPannerHandler::create(AudioNode& node, float sampleRate, AudioParamHandler& pan)
 {
     return adoptRef(new StereoPannerHandler(node, sampleRate, pan));
 }
 
 StereoPannerHandler::~StereoPannerHandler()
@@ skipping 41 matching lines @@
 
 void StereoPannerHandler::setChannelCount(unsigned long channelCount, ExceptionState& exceptionState)
 {
     DCHECK(isMainThread());
     BaseAudioContext::AutoLocker locker(context());
 
     // A PannerNode only supports 1 or 2 channels
     if (channelCount > 0 && channelCount <= 2) {
         if (m_channelCount != channelCount) {
             m_channelCount = channelCount;
-            if (internalChannelCountMode() != Max)
+            if (m_channelCountMode != Max)
                 updateChannelsForInputs();
         }
     } else {
         exceptionState.throwDOMException(
             NotSupportedError,
             ExceptionMessages::indexOutsideRange<unsigned long>(
                 "channelCount",
                 channelCount,
                 1,
                 ExceptionMessages::InclusiveBound,
                 2,
                 ExceptionMessages::InclusiveBound));
     }
 }
 
 void StereoPannerHandler::setChannelCountMode(const String& mode, ExceptionState& exceptionState)
 {
     DCHECK(isMainThread());
     BaseAudioContext::AutoLocker locker(context());
 
+    ChannelCountMode oldMode = m_channelCountMode;
+
     if (mode == "clamped-max") {
-        setInternalChannelCountMode(ClampedMax);
+        m_newChannelCountMode = ClampedMax;
     } else if (mode == "explicit") {
-        setInternalChannelCountMode(Explicit);
+        m_newChannelCountMode = Explicit;
     } else if (mode == "max") {
         // This is not supported for a StereoPannerNode, which can only handle
         // 1 or 2 channels.
         exceptionState.throwDOMException(
             NotSupportedError,
                 "StereoPanner: 'max' is not allowed");
+        m_newChannelCountMode = oldMode;
+    } else {
+        // Do nothing for other invalid values.
+        m_newChannelCountMode = oldMode;
     }
+
+    if (m_newChannelCountMode != oldMode)
+        context()->deferredTaskHandler().addChangedChannelCountMode(this);
 }
 
 // ----------------------------------------------------------------
 
 StereoPannerNode::StereoPannerNode(BaseAudioContext& context)
     : AudioNode(context)
     , m_pan(AudioParam::create(context, ParamTypeStereoPannerPan, 0, -1, 1))
 {
     setHandler(StereoPannerHandler::create(*this, context.sampleRate(), m_pan->handler()));
 }
@@ skipping 16 matching lines @@
     AudioNode::trace(visitor);
 }
 
 AudioParam* StereoPannerNode::pan() const
 {
     return m_pan;
 }
 
 } // namespace blink