Revert CL 2242573002

third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.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 143 matching lines @@
 
         ~OfflineGraphAutoLocker() { m_handler.unlock(); }
 
     private:
         DeferredTaskHandler& m_handler;
     };
 
 private:
     DeferredTaskHandler();
     void updateAutomaticPullNodes();
+    void updateChangedChannelCountMode();
+    void updateChangedChannelInterpretation();
     void handleDirtyAudioSummingJunctions();
     void handleDirtyAudioNodeOutputs();
     void deleteHandlersOnMainThread();
 
     // For the sake of thread safety, we maintain a seperate Vector of automatic
     // pull nodes for rendering in m_renderingAutomaticPullNodes.  It will be
     // copied from m_automaticPullNodes by updateAutomaticPullNodes() at the
     // very start or end of the rendering quantum.
     HashSet<AudioHandler*> m_automaticPullNodes;
     Vector<AudioHandler*> m_renderingAutomaticPullNodes;
     // m_automaticPullNodesNeedUpdating keeps track if m_automaticPullNodes is modified.
     bool m_automaticPullNodesNeedUpdating;
 
+    // Collection of nodes where the channel count mode has changed. We want the
+    // channel count mode to change in the pre- or post-rendering phase so as
+    // not to disturb the running audio thread.
+    HashSet<AudioHandler*> m_deferredCountModeChange;
+
+    HashSet<AudioHandler*> m_deferredChannelInterpretationChange;
+
     // These two HashSet must be accessed only when the graph lock is held.
     // These raw pointers are safe because their destructors unregister them.
     HashSet<AudioSummingJunction*> m_dirtySummingJunctions;
     HashSet<AudioNodeOutput*> m_dirtyAudioNodeOutputs;
 
     // Only accessed in the audio thread.
     Vector<AudioHandler*> m_deferredBreakConnectionList;
 
     Vector<RefPtr<AudioHandler>> m_renderingOrphanHandlers;
     Vector<RefPtr<AudioHandler>> m_deletableOrphanHandlers;
 
     // Graph locking.
     RecursiveMutex m_contextGraphMutex;
     volatile ThreadIdentifier m_audioThread;
 };
 
 } // namespace blink
 
 #endif // DeferredTaskHandler_h