Bug 905409 - Minimize the Web Audio #includes; r=roc

content/media/webaudio/AudioBuffer.cpp

@@ -7,14 +7,12 @@
 #include "AudioBuffer.h"
 #include "mozilla/dom/AudioBufferBinding.h"
 #include "nsContentUtils.h"
-#include "AudioContext.h"
 #include "jsfriendapi.h"
 #include "mozilla/ErrorResult.h"
 #include "AudioSegment.h"
-#include "nsIScriptError.h"
-#include "nsPIDOMWindow.h"
 #include "AudioChannelFormat.h"
 #include "mozilla/PodOperations.h"
+#include "AudioNodeEngine.h"
 
 namespace mozilla {
 namespace dom {

content/media/webaudio/AudioBuffer.h

@@ -14,8 +14,6 @@
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 #include "AudioContext.h"
-#include "AudioSegment.h"
-#include "AudioNodeEngine.h"
 
 struct JSContext;
 class JSObject;
@@ -23,9 +21,12 @@ class JSObject;
 namespace mozilla {
 
 class ErrorResult;
+class ThreadSharedFloatArrayBufferList;
 
 namespace dom {
 
+class AudioContext;
+
 /**
  * An AudioBuffer keeps its data either in the mJSChannels objects, which
  * are Float32Arrays, or in mSharedChannels if the mJSChannels objects have

content/media/webaudio/AudioBufferSourceNode.cpp

@@ -10,7 +10,7 @@
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
 #include "AudioDestinationNode.h"
-#include "PannerNode.h"
+#include "AudioParamTimeline.h"
 #include "speex/speex_resampler.h"
 #include <limits>
 

content/media/webaudio/AudioBufferSourceNode.h

@@ -9,12 +9,12 @@
 
 #include "AudioNode.h"
 #include "AudioBuffer.h"
-#include "AudioParam.h"
-#include "mozilla/dom/BindingUtils.h"
 
 namespace mozilla {
 namespace dom {
 
+class AudioParam;
+
 class AudioBufferSourceNode : public AudioNode,
                               public MainThreadMediaStreamListener
 {

content/media/webaudio/AudioContext.h

@@ -9,9 +9,7 @@
 
 #include "EnableWebAudioCheck.h"
 #include "MediaBufferDecoder.h"
-#include "MediaStreamGraph.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/dom/AudioContextBinding.h"
 #include "mozilla/dom/TypedArray.h"
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
@@ -19,7 +17,6 @@
 #include "nsDOMEventTargetHelper.h"
 #include "nsHashKeys.h"
 #include "nsTHashtable.h"
-#include "StreamBuffer.h"
 
 // X11 has a #define for CurrentTime. Unbelievable :-(.
 // See content/media/DOMMediaStream.h for more fun!
@@ -33,8 +30,10 @@ class nsPIDOMWindow;
 
 namespace mozilla {
 
+class DOMMediaStream;
 class ErrorResult;
-struct WebAudioDecodeJob;
+class MediaStream;
+class MediaStreamGraph;
 
 namespace dom {
 
@@ -55,7 +54,6 @@ class HTMLMediaElement;
 class MediaElementAudioSourceNode;
 class MediaStreamAudioDestinationNode;
 class MediaStreamAudioSourceNode;
-class OfflineRenderSuccessCallback;
 class PannerNode;
 class ScriptProcessorNode;
 class WaveShaperNode;

content/media/webaudio/AudioListener.cpp

@@ -6,7 +6,6 @@
 
 #include "AudioListener.h"
 #include "AudioContext.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AudioListenerBinding.h"
 
 namespace mozilla {

content/media/webaudio/AudioListener.h

@@ -23,8 +23,6 @@ namespace mozilla {
 
 namespace dom {
 
-class AudioContext;
-
 class AudioListener MOZ_FINAL : public nsWrapperCache,
                                 public EnableWebAudioCheck
 {

content/media/webaudio/AudioNode.cpp

@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AudioNode.h"
-#include "AudioContext.h"
 #include "mozilla/ErrorResult.h"
 #include "AudioNodeStream.h"
 

content/media/webaudio/AudioNode.h

@@ -10,24 +10,21 @@
 #include "nsDOMEventTargetHelper.h"
 #include "mozilla/dom/AudioNodeBinding.h"
 #include "nsCycleCollectionParticipant.h"
-#include "mozilla/Attributes.h"
 #include "EnableWebAudioCheck.h"
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 #include "AudioContext.h"
-#include "AudioParamTimeline.h"
 #include "MediaStreamGraph.h"
 #include "WebAudioUtils.h"
 
-struct JSContext;
-
 namespace mozilla {
 
-class ErrorResult;
-
 namespace dom {
 
+class AudioContext;
+class AudioBufferSourceNode;
 class AudioParam;
+class AudioParamTimeline;
 struct ThreeDPoint;
 
 template<class T>

content/media/webaudio/AudioParam.cpp

@@ -5,11 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AudioParam.h"
-#include "nsIDOMWindow.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AudioParamBinding.h"
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
+#include "AudioContext.h"
 
 namespace mozilla {
 namespace dom {

content/media/webaudio/AudioParam.h

@@ -10,16 +10,13 @@
 #include "AudioParamTimeline.h"
 #include "nsWrapperCache.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsCOMPtr.h"
 #include "EnableWebAudioCheck.h"
 #include "nsAutoPtr.h"
 #include "AudioNode.h"
 #include "mozilla/dom/TypedArray.h"
-#include "mozilla/Util.h"
 #include "WebAudioUtils.h"
 
 struct JSContext;
-class nsIDOMWindow;
 
 namespace mozilla {
 

content/media/webaudio/AudioProcessingEvent.cpp

@@ -6,6 +6,7 @@
 
 #include "AudioProcessingEvent.h"
 #include "mozilla/dom/AudioProcessingEventBinding.h"
+#include "AudioContext.h"
 
 namespace mozilla {
 namespace dom {

content/media/webaudio/BiquadFilterNode.cpp

@@ -11,6 +11,7 @@
 #include "WebAudioUtils.h"
 #include "blink/Biquad.h"
 #include "mozilla/Preferences.h"
+#include "AudioParamTimeline.h"
 
 namespace mozilla {
 namespace dom {

content/media/webaudio/ChannelMergerNode.cpp

@@ -8,7 +8,6 @@
 #include "mozilla/dom/ChannelMergerNodeBinding.h"
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
-#include "mozilla/PodOperations.h"
 
 namespace mozilla {
 namespace dom {

content/media/webaudio/ChannelSplitterNode.cpp

@@ -8,7 +8,6 @@
 #include "mozilla/dom/ChannelSplitterNodeBinding.h"
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
-#include "mozilla/PodOperations.h"
 
 namespace mozilla {
 namespace dom {

content/media/webaudio/ConvolverNode.cpp

@@ -9,9 +9,7 @@
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"
 #include "blink/Reverb.h"
-
-#include <cmath>
-#include "nsMathUtils.h"
+#include "PlayingRefChangeHandler.h"
 
 namespace mozilla {
 namespace dom {

content/media/webaudio/ConvolverNode.h

@@ -9,11 +9,12 @@
 
 #include "AudioNode.h"
 #include "AudioBuffer.h"
-#include "PlayingRefChangeHandler.h"
 
 namespace mozilla {
 namespace dom {
 
+template <class T> class PlayingRefChangeHandler;
+
 class ConvolverNode : public AudioNode
 {
 public:

content/media/webaudio/DelayNode.cpp

@@ -11,6 +11,7 @@
 #include "AudioDestinationNode.h"
 #include "WebAudioUtils.h"
 #include "DelayProcessor.h"
+#include "PlayingRefChangeHandler.h"
 
 namespace mozilla {
 namespace dom {

content/media/webaudio/DelayNode.h

@@ -9,12 +9,12 @@
 
 #include "AudioNode.h"
 #include "AudioParam.h"
-#include "PlayingRefChangeHandler.h"
 
 namespace mozilla {
 namespace dom {
 
 class AudioContext;
+template <class T> class PlayingRefChangeHandler;
 
 class DelayNode : public AudioNode
 {

content/media/webaudio/FFTBlock.cpp

@@ -30,8 +30,6 @@
 
 #include "FFTBlock.h"
 
-#include "AudioNodeEngine.h"
-
 #include <complex>
 
 namespace mozilla {

content/media/webaudio/MediaBufferDecoder.cpp

@@ -8,6 +8,7 @@
 #include "AbstractMediaDecoder.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ReentrantMonitor.h"
+#include "mozilla/dom/AudioContextBinding.h"
 #include <speex/speex_resampler.h>
 #include "nsXPCOMCIDInternal.h"
 #include "nsComponentManagerUtils.h"
@@ -16,8 +17,6 @@
 #include "DecoderTraits.h"
 #include "AudioContext.h"
 #include "AudioBuffer.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIScriptContext.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIScriptError.h"
 #include "nsMimeTypes.h"

content/media/webaudio/MediaBufferDecoder.h

@@ -14,11 +14,9 @@
 #include "nsString.h"
 #include "nsTArray.h"
 #include "mozilla/dom/TypedArray.h"
-#include <utility>
 
 namespace mozilla {
 
-class MediaDecoderReader;
 namespace dom {
 class AudioBuffer;
 class AudioContext;

content/media/webaudio/MediaElementAudioSourceNode.cpp

@@ -6,7 +6,6 @@
 
 #include "MediaElementAudioSourceNode.h"
 #include "mozilla/dom/MediaElementAudioSourceNodeBinding.h"
-#include "mozilla/dom/HTMLMediaElement.h"
 
 namespace mozilla {
 namespace dom {

content/media/webaudio/MediaElementAudioSourceNode.h

@@ -12,8 +12,6 @@
 namespace mozilla {
 namespace dom {
 
-class HTMLMediaElement;
-
 class MediaElementAudioSourceNode : public MediaStreamAudioSourceNode
 {
 public:

content/media/webaudio/MediaStreamAudioDestinationNode.cpp

@@ -6,7 +6,6 @@
 
 #include "MediaStreamAudioDestinationNode.h"
 #include "nsIDocument.h"
-#include "mozilla/dom/AudioStreamTrack.h"
 #include "mozilla/dom/MediaStreamAudioDestinationNodeBinding.h"
 #include "AudioNodeEngine.h"
 #include "AudioNodeStream.h"

content/media/webaudio/MediaStreamAudioDestinationNode.h

@@ -10,8 +10,6 @@
 #include "AudioNode.h"
 
 namespace mozilla {
-class DOMMediaStream;
-
 namespace dom {
 
 class MediaStreamAudioDestinationNode : public AudioNode

content/media/webaudio/OfflineAudioCompletionEvent.cpp

@@ -6,6 +6,7 @@
 
 #include "OfflineAudioCompletionEvent.h"
 #include "mozilla/dom/OfflineAudioCompletionEventBinding.h"
+#include "AudioContext.h"
 
 namespace mozilla {
 namespace dom {

content/media/webaudio/OfflineAudioCompletionEvent.h

@@ -9,11 +9,12 @@
 
 #include "nsDOMEvent.h"
 #include "AudioBuffer.h"
-#include "AudioContext.h"
 
 namespace mozilla {
 namespace dom {
 
+class AudioContext;
+
 class OfflineAudioCompletionEvent : public nsDOMEvent,
                                     public EnableWebAudioCheck
 {

content/media/webaudio/PannerNode.cpp

@@ -10,6 +10,7 @@
 #include "AudioListener.h"
 #include "AudioBufferSourceNode.h"
 #include "blink/HRTFPanner.h"
+#include "blink/HRTFDatabaseLoader.h"
 
 using WebCore::HRTFDatabaseLoader;
 using WebCore::HRTFPanner;

content/media/webaudio/PannerNode.h

@@ -8,9 +8,6 @@
 #define PannerNode_h_
 
 #include "AudioNode.h"
-#include "AudioParam.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/TypedEnum.h"
 #include "mozilla/dom/PannerNodeBinding.h"
 #include "ThreeDPoint.h"
 #include "mozilla/WeakPtr.h"

content/media/webaudio/ScriptProcessorNode.h

@@ -11,13 +11,9 @@
 #include "nsAutoPtr.h"
 
 namespace mozilla {
-
-class AudioNodeStream;
-
 namespace dom {
 
 class AudioContext;
-class ScriptProcessorNodeEngine;
 class SharedBuffers;
 
 class ScriptProcessorNode : public AudioNode

content/media/webaudio/WaveShaperNode.h

@@ -8,8 +8,8 @@
 #define WaveShaperNode_h_
 
 #include "AudioNode.h"
-#include "AudioParam.h"
 #include "mozilla/dom/WaveShaperNodeBinding.h"
+#include "mozilla/dom/TypedArray.h"
 
 namespace mozilla {
 namespace dom {

content/media/webaudio/WebAudioUtils.cpp

@@ -6,6 +6,7 @@
 
 #include "WebAudioUtils.h"
 #include "AudioNodeStream.h"
+#include "AudioParamTimeline.h"
 #include "blink/HRTFDatabaseLoader.h"
 
 namespace mozilla {

content/media/webaudio/WebAudioUtils.h

@@ -10,16 +10,18 @@
 #include <cmath>
 #include <limits>
 #include "mozilla/TypeTraits.h"
-#include "mozilla/Assertions.h"
-#include "AudioParamTimeline.h"
+#include "mozilla/FloatingPoint.h"
 #include "MediaSegment.h"
 
 namespace mozilla {
 
 class AudioNodeStream;
+class MediaStream;
 
 namespace dom {
 
+class AudioParamTimeline;
+
 struct WebAudioUtils {
   // This is an arbitrary large number used to protect against OOMs.
   // We can adjust it later if needed.

content/media/webaudio/blink/Biquad.cpp

@@ -30,7 +30,6 @@
 #include "Biquad.h"
 
 #include <algorithm>
-#include <stdio.h>
 
 namespace WebCore {
 

content/media/webaudio/blink/HRTFDatabaseLoader.cpp

@@ -27,7 +27,6 @@
  */
 
 #include "HRTFDatabaseLoader.h"
-
 #include "HRTFDatabase.h"
 
 using namespace mozilla;

content/media/webaudio/blink/HRTFDatabaseLoader.h

@@ -29,11 +29,13 @@
 #ifndef HRTFDatabaseLoader_h
 #define HRTFDatabaseLoader_h
 
-#include "HRTFDatabase.h"
-#include "nsTHashtable.h"
+#include "nsHashKeys.h"
 #include "mozilla/RefPtr.h"
-#include "nsIThread.h"
 #include "mozilla/Mutex.h"
+#include "HRTFDatabase.h"
+
+template <class EntryType> class nsTHashtable;
+template <class T> class nsAutoRef;
 
 namespace WebCore {
 

content/media/webaudio/blink/HRTFPanner.cpp

@@ -23,6 +23,7 @@
  */
 
 #include "HRTFPanner.h"
+#include "HRTFDatabaseLoader.h"
 
 #include "FFTConvolver.h"
 #include "HRTFDatabase.h"

content/media/webaudio/blink/HRTFPanner.h

@@ -26,7 +26,6 @@
 #define HRTFPanner_h
 
 #include "FFTConvolver.h"
-#include "HRTFDatabaseLoader.h"
 #include "DelayProcessor.h"
 
 namespace mozilla {
@@ -35,6 +34,8 @@ struct AudioChunk;
 
 namespace WebCore {
 
+class HRTFDatabaseLoader;
+
 using mozilla::AudioChunk;
 
 class HRTFPanner {

content/media/webaudio/blink/Reverb.cpp

@@ -27,6 +27,7 @@
  */
 
 #include "Reverb.h"
+#include "ReverbConvolverStage.h"
 
 #include <math.h>
 #include "ReverbConvolver.h"

content/media/webaudio/blink/Reverb.h

@@ -32,6 +32,7 @@
 #include "ReverbConvolver.h"
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
+#include "AudioSegment.h"
 
 namespace mozilla {
 class ThreadSharedFloatArrayBufferList;
@@ -39,6 +40,9 @@ class ThreadSharedFloatArrayBufferList;
 
 namespace WebCore {
 
+class DirectConvolver;
+class FFTConvolver;
+
 // Multi-channel convolution reverb with channel matrixing - one or more ReverbConvolver objects are used internally.
 
 class Reverb {

content/media/webaudio/blink/ReverbConvolver.cpp

@@ -27,6 +27,7 @@
  */
 
 #include "ReverbConvolver.h"
+#include "ReverbConvolverStage.h"
 
 using namespace mozilla;
 

content/media/webaudio/blink/ReverbConvolver.h

@@ -29,14 +29,8 @@
 #ifndef ReverbConvolver_h
 #define ReverbConvolver_h
 
-#include "DirectConvolver.h"
-#include "FFTConvolver.h"
 #include "ReverbAccumulationBuffer.h"
-#include "ReverbConvolverStage.h"
 #include "ReverbInputBuffer.h"
-#include "nsAutoPtr.h"
-#include "nsTArray.h"
-#include "nsCOMPtr.h"
 #ifdef LOG
 #undef LOG
 #endif
@@ -46,7 +40,7 @@
 
 namespace WebCore {
 
-class AudioChannel;
+class ReverbConvolverStage;
 
 class ReverbConvolver {
 public:

content/media/webaudio/blink/ReverbConvolverStage.h

@@ -29,6 +29,9 @@
 #ifndef ReverbConvolverStage_h
 #define ReverbConvolverStage_h
 
+#include "DirectConvolver.h"
+#include "FFTConvolver.h"
+
 #include "nsTArray.h"
 #include "mozilla/FFTBlock.h"
 
@@ -38,8 +41,6 @@ using mozilla::FFTBlock;
 
 class ReverbAccumulationBuffer;
 class ReverbConvolver;
-class FFTConvolver;
-class DirectConvolver;
 
 // A ReverbConvolverStage represents the convolution associated with a sub-section of a large impulse response.
 // It incorporates a delay line to account for the offset of the sub-section within the larger impulse response.