Revert CL 2242573002

third_party/WebKit/Source/modules/webaudio/AudioNode.h

 /*
  * 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 194 matching lines @@
 
     unsigned long channelCount();
     virtual void setChannelCount(unsigned long, ExceptionState&);
 
     String channelCountMode();
     virtual void setChannelCountMode(const String&, ExceptionState&);
 
     String channelInterpretation();
     void setChannelInterpretation(const String&, ExceptionState&);
 
-    void setInternalChannelCountMode(ChannelCountMode newMode)
-    {
-        releaseStore(&m_channelCountMode, newMode);
-    }
+    ChannelCountMode internalChannelCountMode() const { return m_channelCountMode; }
+    AudioBus::ChannelInterpretation internalChannelInterpretation() const { return m_channelInterpretation; }
 
-    ChannelCountMode internalChannelCountMode() const
-    {
-        return static_cast<ChannelCountMode>(
-            acquireLoad(&m_channelCountMode));
-    }
-
-    void setInternalChannelInterpretation(unsigned newValue)
-    {
-        releaseStore(&m_channelInterpretation, newValue);
-    }
-
-    AudioBus::ChannelInterpretation internalChannelInterpretation() const
-    {
-        return static_cast<AudioBus::ChannelInterpretation>(
-            acquireLoad(&m_channelInterpretation));
-    }
+    void updateChannelCountMode();
+    void updateChannelInterpretation();
 
 protected:
     // Inputs and outputs must be created before the AudioHandler is
     // initialized.
     void addInput();
     void addOutput(unsigned numberOfChannels);
 
     // Called by processIfNecessary() to cause all parts of the rendering graph connected to us to process.
     // Each rendering quantum, the audio data for each of the AudioNode's inputs will be available after this method is called.
     // Called from context's audio thread.
@@ skipping 31 matching lines @@
 
     bool m_isDisabled;
 
 #if DEBUG_AUDIONODE_REFERENCES
     static bool s_isNodeCountInitialized;
     static int s_nodeCount[NodeTypeEnd];
 #endif
 
 protected:
     unsigned m_channelCount;
+    ChannelCountMode m_channelCountMode;
+    AudioBus::ChannelInterpretation m_channelInterpretation;
+    // The new channel count mode that will be used to set the actual mode in the pre or post
+    // rendering phase.
+    ChannelCountMode m_newChannelCountMode;
+    // The new channel interpretation that will be used to set the actual
+    // intepretation in the pre or post rendering phase.
+    AudioBus::ChannelInterpretation m_newChannelInterpretation;
 
-private:
-    // These are private to force use of the setters and getters.
-
-    // The internal representation of the channel count mode and interpretation.
-    unsigned m_channelCountMode;
-    unsigned m_channelInterpretation;
 };
 
 class MODULES_EXPORT AudioNode : public EventTargetWithInlineData {
     DEFINE_WRAPPERTYPEINFO();
     USING_PRE_FINALIZER(AudioNode, dispose);
 public:
     DECLARE_VIRTUAL_TRACE();
     AudioHandler& handler() const;
 
     virtual AudioNode* connect(AudioNode*, unsigned outputIndex, unsigned inputIndex, ExceptionState&);
@@ skipping 46 matching lines @@
     HeapVector<Member<HeapHashSet<Member<AudioNode>>>> m_connectedNodes;
     // Represents audio node graph with Oilpan references. N-th HeapHashSet
     // represents a set of AudioParam objects connected to this AudioNode's N-th
     // output.
     HeapVector<Member<HeapHashSet<Member<AudioParam>>>> m_connectedParams;
 };
 
 } // namespace blink
 
 #endif // AudioNode_h