Revert CL 2242573002

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

 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 54 matching lines @@
     , m_positionZ(positionZ)
     , m_orientationX(orientationX)
     , m_orientationY(orientationY)
     , m_orientationZ(orientationZ)
 {
     addInput();
     addOutput(2);
 
     // Node-specific default mixing rules.
     m_channelCount = 2;
-    setInternalChannelCountMode(ClampedMax);
-    setInternalChannelInterpretation(AudioBus::Speakers);
+    m_channelCountMode = ClampedMax;
+    m_channelInterpretation = AudioBus::Speakers;
 
     // Explicitly set the default panning model here so that the histograms
     // include the default value.
     setPanningModel("equalpower");
 
     initialize();
 }
 
 PassRefPtr<PannerHandler> PannerHandler::create(
     AudioNode& node, float sampleRate,
@@ skipping 471 matching lines @@
 
 void PannerHandler::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 PannerHandler::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 PannerNode, which can only handle 1 or 2 channels.
         exceptionState.throwDOMException(
             NotSupportedError,
                 "Panner: '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);
 }
 
 bool PannerHandler::hasSampleAccurateValues() const
 {
     return m_positionX->hasSampleAccurateValues()
         || m_positionY->hasSampleAccurateValues()
         || m_positionZ->hasSampleAccurateValues()
         || m_orientationX->hasSampleAccurateValues()
         || m_orientationY->hasSampleAccurateValues()
         || m_orientationZ->hasSampleAccurateValues();
@@ skipping 158 matching lines @@
     visitor->trace(m_positionZ);
 
     visitor->trace(m_orientationX);
     visitor->trace(m_orientationY);
     visitor->trace(m_orientationZ);
 
     AudioNode::trace(visitor);
 }
 
 } // namespace blink