Investigation for bug 866079 - Make the Command class live in the global scope in the hopes of getting better stack traces

content/media/webaudio/ScriptProcessorNode.cpp

@@ -234,27 +234,60 @@ private:
     }
   }
 
-  void SendBuffersToMainThread(AudioNodeStream* aStream)
-  {
-    MOZ_ASSERT(!NS_IsMainThread());
+  void SendBuffersToMainThread(AudioNodeStream* aStream);
 
-    // we now have a full input buffer ready to be sent to the main thread.
-    TrackTicks playbackTick = mSource->GetCurrentPosition();
-    // Add the duration of the current sample
-    playbackTick += WEBAUDIO_BLOCK_SIZE;
-    // Add the delay caused by the main thread
-    playbackTick += mSharedBuffers->DelaySoFar();
-    // Compute the playback time in the coordinate system of the destination
-    double playbackTime =
-      WebAudioUtils::StreamPositionToDestinationTime(playbackTick,
-                                                     mSource,
-                                                     mDestination);
+  friend class ScriptProcessorNode;
 
-    class Command : public nsRunnable
-    {
-    public:
-      Command(AudioNodeStream* aStream,
-              InputChannels& aInputChannels,
+  SharedBuffers* mSharedBuffers;
+  AudioNodeStream* mSource;
+  AudioNodeStream* mDestination;
+  InputChannels mInputChannels;
+  const uint32_t mBufferSize;
+  // The write index into the current input buffer
+  uint32_t mInputWriteIndex;
+  bool mSeenNonSilenceInput;
+};
+
+ScriptProcessorNode::ScriptProcessorNode(AudioContext* aContext,
+                                         uint32_t aBufferSize,
+                                         uint32_t aNumberOfInputChannels,
+                                         uint32_t aNumberOfOutputChannels)
+  : AudioNode(aContext)
+  , mSharedBuffers(new SharedBuffers())
+  , mBufferSize(aBufferSize ?
+                  aBufferSize : // respect what the web developer requested
+                  4096)         // choose our own buffer size -- 4KB for now
+  , mNumberOfOutputChannels(aNumberOfOutputChannels)
+{
+  MOZ_ASSERT(BufferSize() % WEBAUDIO_BLOCK_SIZE == 0, "Invalid buffer size");
+  ScriptProcessorNodeEngine* engine =
+    new ScriptProcessorNodeEngine(this,
+                                  aContext->Destination(),
+                                  BufferSize(),
+                                  aNumberOfInputChannels);
+  mStream = aContext->Graph()->CreateAudioNodeStream(engine, MediaStreamGraph::INTERNAL_STREAM,
+                                                     aNumberOfInputChannels);
+  engine->SetSourceStream(static_cast<AudioNodeStream*> (mStream.get()));
+}
+
+ScriptProcessorNode::~ScriptProcessorNode()
+{
+  if (Context()) {
+    Context()->UnregisterScriptProcessorNode(this);
+  }
+}
+
+JSObject*
+ScriptProcessorNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
+{
+  return ScriptProcessorNodeBinding::Wrap(aCx, aScope, this);
+}
+
+class DispatchAudioProcessEventCommand : public nsRunnable
+{
+public:
+  DispatchAudioProcessEventCommand(AudioNodeStream* aStream,
+                                   ScriptProcessorNodeEngine::InputChannels& aInputChannels,
                                    double aPlaybackTime,
                                    bool aNullInput)
     : mStream(aStream)
@@ -331,63 +364,33 @@ private:
     }
     return NS_OK;
   }
-    private:
+private:
   nsRefPtr<AudioNodeStream> mStream;
-      InputChannels mInputChannels;
+  ScriptProcessorNodeEngine::InputChannels mInputChannels;
   double mPlaybackTime;
   bool mNullInput;
-    };
-
-    NS_DispatchToMainThread(new Command(aStream, mInputChannels,
-                                        playbackTime,
-                                        !mSeenNonSilenceInput));
-  }
-
-  friend class ScriptProcessorNode;
-
-  SharedBuffers* mSharedBuffers;
-  AudioNodeStream* mSource;
-  AudioNodeStream* mDestination;
-  InputChannels mInputChannels;
-  const uint32_t mBufferSize;
-  // The write index into the current input buffer
-  uint32_t mInputWriteIndex;
-  bool mSeenNonSilenceInput;
 };
 
-ScriptProcessorNode::ScriptProcessorNode(AudioContext* aContext,
-                                         uint32_t aBufferSize,
-                                         uint32_t aNumberOfInputChannels,
-                                         uint32_t aNumberOfOutputChannels)
-  : AudioNode(aContext)
-  , mSharedBuffers(new SharedBuffers())
-  , mBufferSize(aBufferSize ?
-                  aBufferSize : // respect what the web developer requested
-                  4096)         // choose our own buffer size -- 4KB for now
-  , mNumberOfOutputChannels(aNumberOfOutputChannels)
+void
+ScriptProcessorNodeEngine::SendBuffersToMainThread(AudioNodeStream* aStream)
 {
-  MOZ_ASSERT(BufferSize() % WEBAUDIO_BLOCK_SIZE == 0, "Invalid buffer size");
-  ScriptProcessorNodeEngine* engine =
-    new ScriptProcessorNodeEngine(this,
-                                  aContext->Destination(),
-                                  BufferSize(),
-                                  aNumberOfInputChannels);
-  mStream = aContext->Graph()->CreateAudioNodeStream(engine, MediaStreamGraph::INTERNAL_STREAM,
-                                                     aNumberOfInputChannels);
-  engine->SetSourceStream(static_cast<AudioNodeStream*> (mStream.get()));
-}
+  MOZ_ASSERT(!NS_IsMainThread());
 
-ScriptProcessorNode::~ScriptProcessorNode()
-{
-  if (Context()) {
-    Context()->UnregisterScriptProcessorNode(this);
-  }
-}
+  // we now have a full input buffer ready to be sent to the main thread.
+  TrackTicks playbackTick = mSource->GetCurrentPosition();
+  // Add the duration of the current sample
+  playbackTick += WEBAUDIO_BLOCK_SIZE;
+  // Add the delay caused by the main thread
+  playbackTick += mSharedBuffers->DelaySoFar();
+  // Compute the playback time in the coordinate system of the destination
+  double playbackTime =
+    WebAudioUtils::StreamPositionToDestinationTime(playbackTick,
+                                                   mSource,
+                                                   mDestination);
 
-JSObject*
-ScriptProcessorNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
-{
-  return ScriptProcessorNodeBinding::Wrap(aCx, aScope, this);
+  NS_DispatchToMainThread(new DispatchAudioProcessEventCommand(aStream, mInputChannels,
+                                                               playbackTime,
+                                                               !mSeenNonSilenceInput));
 }
 
 }