Web Audio: Unapply Oilpan to AudioSummingJunction.

Source/modules/webaudio/AudioSummingJunction.cpp

 /*
  * Copyright (C) 2012, 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 14 matching lines @@
 #include "config.h"
 #if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AudioSummingJunction.h"
 
 #include "modules/webaudio/AudioContext.h"
 #include "modules/webaudio/AudioNodeOutput.h"
 #include <algorithm>
 
 namespace blink {
 
-AudioSummingJunction::AudioSummingJunction(AudioContext* context)
-    : m_context(context)
+AudioSummingJunction::AudioSummingJunction(DeferredTaskHandler& handler)
+    : m_deferredTaskHandler(handler)
     , m_renderingStateNeedUpdating(false)
     , m_didCallDispose(false)
 {
-    ASSERT(context);
-    m_context->registerLiveAudioSummingJunction(*this);
-}
-
-void AudioSummingJunction::dispose()
-{
-    m_didCallDispose = true;
-    m_context->handler().removeMarkedSummingJunction(this);
 }
 
 AudioSummingJunction::~AudioSummingJunction()
 {
-}
-
-DEFINE_TRACE(AudioSummingJunction)
-{
-    visitor->trace(m_context);
-    // FIXME: Oilpan: m_renderingOutputs should not be strong references.  This
-    // is a short-term workaround to avoid crashes, and causes AudioNode leaks.
-    AudioContext::AutoLocker locker(m_context);
-    for (size_t i = 0; i < m_renderingOutputs.size(); ++i)
-        visitor->trace(m_renderingOutputs[i]);
+    m_didCallDispose = true;

[haraken, 2015/03/25 12:34:48]

I guess m_didCallDispose is no longer helpful.

[tkent, 2015/03/25 22:28:08]

Right.  Will remove it.

+    deferredTaskHandler().removeMarkedSummingJunction(this);
 }
 
 void AudioSummingJunction::changedOutputs()
 {
-    ASSERT(context()->isGraphOwner());
+    ASSERT(deferredTaskHandler().isGraphOwner());
     if (!m_renderingStateNeedUpdating && !m_didCallDispose) {
-        context()->handler().markSummingJunctionDirty(this);
+        deferredTaskHandler().markSummingJunctionDirty(this);
         m_renderingStateNeedUpdating = true;
     }
 }
 
 void AudioSummingJunction::updateRenderingState()
 {
-    ASSERT(context()->isAudioThread());
-    ASSERT(context()->isGraphOwner());
+    ASSERT(deferredTaskHandler().isAudioThread());
+    ASSERT(deferredTaskHandler().isGraphOwner());
     if (m_renderingStateNeedUpdating) {
         // Copy from m_outputs to m_renderingOutputs.
         m_renderingOutputs.resize(m_outputs.size());
         unsigned j = 0;
         for (AudioNodeOutput* output : m_outputs) {
             m_renderingOutputs[j++] = output;
             output->updateRenderingState();
         }
 
         didUpdate();
 
         m_renderingStateNeedUpdating = false;
     }
 }
 
 } // namespace blink
 
 #endif // ENABLE(WEB_AUDIO)