Web Audio: Unapply Oilpan to AudioSummingJunction.

Source/modules/webaudio/AudioParam.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
@@ skipping 23 matching lines @@
 #include "wtf/MathExtras.h"
 
 namespace blink {
 
 const double AudioParamHandler::DefaultSmoothingConstant = 0.05;
 const double AudioParamHandler::SnapThreshold = 0.001;
 
 float AudioParamHandler::value()
 {
     // Update value for timeline.
-    if (context() && context()->isAudioThread()) {
+    if (deferredTaskHandler().isAudioThread()) {
         bool hasValue;
         float timelineValue = m_timeline.valueForContextTime(context(), narrowPrecisionToFloat(m_value), hasValue);
 
         if (hasValue)
             m_value = timelineValue;
     }
 
     return narrowPrecisionToFloat(m_value);
 }
 
@@ skipping 38 matching lines @@
 
 float AudioParamHandler::finalValue()
 {
     float value = m_value;
     calculateFinalValues(&value, 1, false);
     return value;
 }
 
 void AudioParamHandler::calculateSampleAccurateValues(float* values, unsigned numberOfValues)
 {
-    bool isSafe = context() && context()->isAudioThread() && values && numberOfValues;
+    bool isSafe = deferredTaskHandler().isAudioThread() && values && numberOfValues;
     ASSERT(isSafe);
     if (!isSafe)
         return;
 
     calculateFinalValues(values, numberOfValues, true);
 }
 
 void AudioParamHandler::calculateFinalValues(float* values, unsigned numberOfValues, bool sampleAccurate)
 {
-    bool isGood = context() && context()->isAudioThread() && values && numberOfValues;
+    bool isGood = deferredTaskHandler().isAudioThread() && values && numberOfValues;
     ASSERT(isGood);
     if (!isGood)
         return;
 
     // The calculated result will be the "intrinsic" value summed with all audio-rate connections.
 
     if (sampleAccurate) {
         // Calculate sample-accurate (a-rate) intrinsic values.
         calculateTimelineValues(values, numberOfValues);
     } else {
@@ skipping 32 matching lines @@
     double startTime = context()->currentTime();
     double endTime = startTime + numberOfValues / sampleRate;
 
     // Note we're running control rate at the sample-rate.
     // Pass in the current value as default value.
     m_value = m_timeline.valuesForTimeRange(startTime, endTime, narrowPrecisionToFloat(m_value), values, numberOfValues, sampleRate, sampleRate);
 }
 
 void AudioParamHandler::connect(AudioNodeOutput& output)
 {
-    ASSERT(context()->isGraphOwner());
+    ASSERT(deferredTaskHandler().isGraphOwner());
 
     if (m_outputs.contains(&output))
         return;
 
     output.addParam(*this);
     m_outputs.add(&output);
     changedOutputs();
 }
 
 void AudioParamHandler::disconnect(AudioNodeOutput& output)
 {
-    ASSERT(context()->isGraphOwner());
+    ASSERT(deferredTaskHandler().isGraphOwner());
 
     if (m_outputs.contains(&output)) {
         m_outputs.remove(&output);
         changedOutputs();
         output.removeParam(*this);
     }
 }
 
+DEFINE_TRACE(AudioParamHandler)
+{
+    visitor->trace(m_context);
+    // TODO(tkent): Oilpan: m_renderingOutputs should not be strong references.
+    // This is a short-term workaround to avoid crashes, and causes AudioNode
+    // leaks.
+    AudioContext::AutoLocker locker(deferredTaskHandler());
+    for (size_t i = 0; i < m_renderingOutputs.size(); ++i)
+        visitor->trace(m_renderingOutputs[i]);
+}
+
 } // namespace blink
 
 #endif // ENABLE(WEB_AUDIO)