Revert CL 2242573002

third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.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 161 matching lines @@
 }
 
 void DeferredTaskHandler::processAutomaticPullNodes(size_t framesToProcess)
 {
     DCHECK(isAudioThread());
 
     for (unsigned i = 0; i < m_renderingAutomaticPullNodes.size(); ++i)
         m_renderingAutomaticPullNodes[i]->processIfNecessary(framesToProcess);
 }
 
+void DeferredTaskHandler::addChangedChannelCountMode(AudioHandler* node)
+{
+    ASSERT(isGraphOwner());
+    DCHECK(isMainThread());
+    m_deferredCountModeChange.add(node);
+}
+
+void DeferredTaskHandler::removeChangedChannelCountMode(AudioHandler* node)
+{
+    ASSERT(isGraphOwner());
+
+    m_deferredCountModeChange.remove(node);
+}
+
+void DeferredTaskHandler::addChangedChannelInterpretation(AudioHandler* node)
+{
+    ASSERT(isGraphOwner());
+    DCHECK(isMainThread());
+    m_deferredChannelInterpretationChange.add(node);
+}
+
+void DeferredTaskHandler::removeChangedChannelInterpretation(AudioHandler* node)
+{
+    ASSERT(isGraphOwner());
+
+    m_deferredChannelInterpretationChange.remove(node);
+}
+
+void DeferredTaskHandler::updateChangedChannelCountMode()
+{
+    ASSERT(isGraphOwner());
+
+    for (AudioHandler* node : m_deferredCountModeChange)
+        node->updateChannelCountMode();
+    m_deferredCountModeChange.clear();
+}
+
+void DeferredTaskHandler::updateChangedChannelInterpretation()
+{
+    ASSERT(isGraphOwner());
+
+    for (AudioHandler* node : m_deferredChannelInterpretationChange)
+        node->updateChannelInterpretation();
+    m_deferredChannelInterpretationChange.clear();
+}
+
 DeferredTaskHandler::DeferredTaskHandler()
     : m_automaticPullNodesNeedUpdating(false)
     , m_audioThread(0)
 {
 }
 
 PassRefPtr<DeferredTaskHandler> DeferredTaskHandler::create()
 {
     return adoptRef(new DeferredTaskHandler());
 }
 
 DeferredTaskHandler::~DeferredTaskHandler()
 {
     DCHECK(!m_automaticPullNodes.size());
     if (m_automaticPullNodesNeedUpdating)
         m_renderingAutomaticPullNodes.resize(m_automaticPullNodes.size());
     DCHECK(!m_renderingAutomaticPullNodes.size());
 }
 
 void DeferredTaskHandler::handleDeferredTasks()
 {
+    updateChangedChannelCountMode();
+    updateChangedChannelInterpretation();
     handleDirtyAudioSummingJunctions();
     handleDirtyAudioNodeOutputs();
     updateAutomaticPullNodes();
 }
 
 void DeferredTaskHandler::contextWillBeDestroyed()
 {
     for (auto& handler : m_renderingOrphanHandlers)
         handler->clearContext();
     for (auto& handler : m_deletableOrphanHandlers)
@@ skipping 49 matching lines @@
 
 void DeferredTaskHandler::setAudioThreadToCurrentThread()
 {
     DCHECK(!isMainThread());
     ThreadIdentifier thread = currentThread();
     releaseStore(&m_audioThread, thread);
 }
 
 } // namespace blink