From 3956f8e1f511be841f4dd19eecb16e83ffc59303 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Fri, 6 Sep 2013 13:50:24 -0400 Subject: [PATCH] Bug 913531 - Remove the unnecessary #includes from nsIXPConnect.idl; r=bholley --- .../base/public/nsHostObjectProtocolHandler.h | 2 +- content/base/src/nsXMLHttpRequest.cpp | 1 + content/base/src/nsXMLHttpRequest.h | 1 + content/html/content/src/HTMLAudioElement.cpp | 1 + content/media/WebVTTLoadListener.cpp | 1 + content/media/mediasource/MediaSource.cpp | 1 + content/media/mediasource/MediaSource.h | 2 ++ dom/base/nsDOMClassInfo.cpp | 1 + dom/base/nsDOMException.cpp | 1 + dom/base/nsGlobalWindow.h | 1 + dom/base/nsJSEnvironment.cpp | 1 + dom/base/nsJSTimeoutHandler.cpp | 1 + dom/bindings/BindingUtils.h | 1 + dom/devicestorage/DeviceStorage.h | 2 ++ dom/indexedDB/IndexedDatabase.h | 2 +- dom/workers/XMLHttpRequest.cpp | 1 + .../components/find/src/nsWebBrowserFind.cpp | 1 + js/xpconnect/idl/nsIXPCScriptable.idl | 1 + js/xpconnect/idl/nsIXPConnect.idl | 18 ++++++------------ js/xpconnect/src/nsXPConnect.cpp | 2 ++ js/xpconnect/src/xpcprivate.h | 1 + layout/style/nsCSSStyleSheet.cpp | 1 + layout/xul/base/src/nsBoxObject.cpp | 1 + layout/xul/tree/nsTreeSelection.cpp | 1 + 24 files changed, 32 insertions(+), 14 deletions(-) diff --git a/content/base/public/nsHostObjectProtocolHandler.h b/content/base/public/nsHostObjectProtocolHandler.h index a32d91e5920..85f06512b23 100644 --- a/content/base/public/nsHostObjectProtocolHandler.h +++ b/content/base/public/nsHostObjectProtocolHandler.h @@ -9,6 +9,7 @@ #include "nsIProtocolHandler.h" #include "nsIURI.h" #include "nsCOMPtr.h" +#include "nsIInputStream.h" #define BLOBURI_SCHEME "blob" #define MEDIASTREAMURI_SCHEME "mediastream" @@ -18,7 +19,6 @@ class nsIDOMBlob; class nsIDOMMediaStream; class nsIPrincipal; -class nsIInputStream; namespace mozilla { namespace dom { diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index 3498f49c434..14708760e28 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -67,6 +67,7 @@ #include "nsCharSeparatedTokenizer.h" #include "nsFormData.h" #include "nsStreamListenerWrapper.h" +#include "xpcjsid.h" #include "nsWrapperCacheInlines.h" diff --git a/content/base/src/nsXMLHttpRequest.h b/content/base/src/nsXMLHttpRequest.h index 9f98967cb7a..ef2eb8e50fa 100644 --- a/content/base/src/nsXMLHttpRequest.h +++ b/content/base/src/nsXMLHttpRequest.h @@ -48,6 +48,7 @@ class nsFormData; class nsIJARChannel; class nsILoadGroup; class nsIUnicodeDecoder; +class nsIJSID; namespace mozilla { diff --git a/content/html/content/src/HTMLAudioElement.cpp b/content/html/content/src/HTMLAudioElement.cpp index f4efc8ef05e..3157f330925 100644 --- a/content/html/content/src/HTMLAudioElement.cpp +++ b/content/html/content/src/HTMLAudioElement.cpp @@ -18,6 +18,7 @@ #include "AudioChannelCommon.h" #include #include "mozilla/Preferences.h" +#include "nsComponentManagerUtils.h" static bool IsAudioAPIEnabled() diff --git a/content/media/WebVTTLoadListener.cpp b/content/media/WebVTTLoadListener.cpp index 60ae7bd8380..fa0096433a4 100644 --- a/content/media/WebVTTLoadListener.cpp +++ b/content/media/WebVTTLoadListener.cpp @@ -6,6 +6,7 @@ #include "WebVTTLoadListener.h" #include "mozilla/dom/TextTrackCue.h" #include "mozilla/dom/HTMLTrackElement.h" +#include "nsIInputStream.h" namespace mozilla { namespace dom { diff --git a/content/media/mediasource/MediaSource.cpp b/content/media/mediasource/MediaSource.cpp index 5902a5cb640..c617519c8d4 100644 --- a/content/media/mediasource/MediaSource.cpp +++ b/content/media/mediasource/MediaSource.cpp @@ -11,6 +11,7 @@ #include "SourceBuffer.h" #include "SourceBufferList.h" #include "nsContentTypeParser.h" +#include "nsIInputStream.h" #ifdef PR_LOGGING PRLogModuleInfo* gMediaSourceLog; diff --git a/content/media/mediasource/MediaSource.h b/content/media/mediasource/MediaSource.h index a5dc5589cd8..27420e9f184 100644 --- a/content/media/mediasource/MediaSource.h +++ b/content/media/mediasource/MediaSource.h @@ -18,6 +18,8 @@ #include "nsWrapperCache.h" #include "nscore.h" +class nsIInputStream; + namespace mozilla { namespace dom { diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index 35fcf01b813..8bf96d7508a 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -190,6 +190,7 @@ #include "mozilla/dom/BindingUtils.h" #include "mozilla/Likely.h" #include "WindowNamedPropertiesHandler.h" +#include "nsIInterfaceInfoManager.h" #ifdef MOZ_TIME_MANAGER #include "TimeManager.h" diff --git a/dom/base/nsDOMException.cpp b/dom/base/nsDOMException.cpp index e1640c30a40..3fe99472761 100644 --- a/dom/base/nsDOMException.cpp +++ b/dom/base/nsDOMException.cpp @@ -15,6 +15,7 @@ #include "nsIDocument.h" #include "nsString.h" #include "prprf.h" +#include "nsIException.h" using namespace mozilla; diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h index 15c0874d614..d884ab0a0ec 100644 --- a/dom/base/nsGlobalWindow.h +++ b/dom/base/nsGlobalWindow.h @@ -49,6 +49,7 @@ #include "mozilla/dom/EventTarget.h" #include "Units.h" +#include "nsComponentManagerUtils.h" #ifdef MOZ_B2G #include "nsIDOMWindowB2G.h" diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 43df9c29921..7a457d8dcde 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -55,6 +55,7 @@ #include "StructuredCloneTags.h" #include "mozilla/dom/ImageData.h" #include "mozilla/dom/ImageDataBinding.h" +#include "nsAXPCNativeCallContext.h" #include "nsJSPrincipals.h" diff --git a/dom/base/nsJSTimeoutHandler.cpp b/dom/base/nsJSTimeoutHandler.cpp index 2deacc09568..ffabe99bec9 100644 --- a/dom/base/nsJSTimeoutHandler.cpp +++ b/dom/base/nsJSTimeoutHandler.cpp @@ -17,6 +17,7 @@ #include "mozilla/Likely.h" #include #include "mozilla/dom/FunctionBinding.h" +#include "nsAXPCNativeCallContext.h" static const char kSetIntervalStr[] = "setInterval"; static const char kSetTimeoutStr[] = "setTimeout"; diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h index 884875ca1bb..15405eab126 100644 --- a/dom/bindings/BindingUtils.h +++ b/dom/bindings/BindingUtils.h @@ -28,6 +28,7 @@ #include "nsTraceRefcnt.h" #include "qsObjectHelper.h" #include "xpcpublic.h" +#include "nsIVariant.h" #include "nsWrapperCacheInlines.h" diff --git a/dom/devicestorage/DeviceStorage.h b/dom/devicestorage/DeviceStorage.h index 694e53d55ef..eece1d7d40a 100644 --- a/dom/devicestorage/DeviceStorage.h +++ b/dom/devicestorage/DeviceStorage.h @@ -23,6 +23,8 @@ #define DEVICESTORAGE_SDCARD "sdcard" #define DEVICESTORAGE_CRASHES "crashes" +class nsIInputStream; + namespace mozilla { namespace dom { class DeviceStorageEnumerationParameters; diff --git a/dom/indexedDB/IndexedDatabase.h b/dom/indexedDB/IndexedDatabase.h index 582dfc34c39..530b2cbc653 100644 --- a/dom/indexedDB/IndexedDatabase.h +++ b/dom/indexedDB/IndexedDatabase.h @@ -17,6 +17,7 @@ #include "nsError.h" #include "nsStringGlue.h" #include "nsTArray.h" +#include "nsIInputStream.h" #define BEGIN_INDEXEDDB_NAMESPACE \ namespace mozilla { namespace dom { namespace indexedDB { @@ -28,7 +29,6 @@ using namespace mozilla::dom::indexedDB; class nsIDOMBlob; -class nsIInputStream; BEGIN_INDEXEDDB_NAMESPACE diff --git a/dom/workers/XMLHttpRequest.cpp b/dom/workers/XMLHttpRequest.cpp index 2a253eb5a3d..6b65e5a03f0 100644 --- a/dom/workers/XMLHttpRequest.cpp +++ b/dom/workers/XMLHttpRequest.cpp @@ -30,6 +30,7 @@ #include "DOMBindingInlines.h" #include "mozilla/Attributes.h" +#include "nsComponentManagerUtils.h" using namespace mozilla; diff --git a/embedding/components/find/src/nsWebBrowserFind.cpp b/embedding/components/find/src/nsWebBrowserFind.cpp index e7813e64001..7d765741ce1 100644 --- a/embedding/components/find/src/nsWebBrowserFind.cpp +++ b/embedding/components/find/src/nsWebBrowserFind.cpp @@ -38,6 +38,7 @@ #include "nsFocusManager.h" #include "mozilla/Services.h" #include "mozilla/dom/Element.h" +#include "nsISimpleEnumerator.h" #if DEBUG #include "nsIWebNavigation.h" diff --git a/js/xpconnect/idl/nsIXPCScriptable.idl b/js/xpconnect/idl/nsIXPCScriptable.idl index 6ae28849805..515a3fc112d 100644 --- a/js/xpconnect/idl/nsIXPCScriptable.idl +++ b/js/xpconnect/idl/nsIXPCScriptable.idl @@ -6,6 +6,7 @@ #include "nsISupports.idl" #include "nsIXPConnect.idl" +#include "nsIClassInfo.idl" %{C++ #ifdef XP_WIN diff --git a/js/xpconnect/idl/nsIXPConnect.idl b/js/xpconnect/idl/nsIXPConnect.idl index e4b9d250236..f30e1fb4656 100644 --- a/js/xpconnect/idl/nsIXPConnect.idl +++ b/js/xpconnect/idl/nsIXPConnect.idl @@ -7,26 +7,15 @@ /* The core XPConnect public interfaces. */ #include "nsISupports.idl" -#include "nsIClassInfo.idl" -#include "xpccomponents.idl" -#include "xpcjsid.idl" -#include "xpcexception.idl" -#include "nsIInterfaceInfo.idl" -#include "nsIInterfaceInfoManager.idl" -#include "nsIExceptionService.idl" -#include "nsIVariant.idl" -#include "nsIObjectOutputStream.idl" -#include "nsIObjectInputStream.idl" %{ C++ #include "jspubtd.h" #include "js/TypeDecls.h" -#include "xptinfo.h" -#include "nsAXPCNativeCallContext.h" struct JSFreeOp; class nsWrapperCache; +class nsAXPCNativeCallContext; %} /***************************************************************************/ @@ -58,6 +47,11 @@ interface nsIXPConnectWrappedNative; interface nsIInterfaceInfo; interface nsIXPCSecurityManager; interface nsIPrincipal; +interface nsIClassInfo; +interface nsIVariant; +interface nsIStackFrame; +interface nsIObjectInputStream; +interface nsIObjectOutputStream; /***************************************************************************/ [uuid(909e8641-7c54-4dff-9b94-ba631f057b33)] diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp index 3c4dde7eb32..6cfb20410a2 100644 --- a/js/xpconnect/src/nsXPConnect.cpp +++ b/js/xpconnect/src/nsXPConnect.cpp @@ -53,6 +53,8 @@ #include "nsICycleCollectorListener.h" #include "nsThread.h" #include "mozilla/XPTInterfaceInfoManager.h" +#include "nsIObjectInputStream.h" +#include "nsIObjectOutputStream.h" using namespace mozilla; using namespace mozilla::dom; diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h index 623aec19477..5ea6f85cac6 100644 --- a/js/xpconnect/src/xpcprivate.h +++ b/js/xpconnect/src/xpcprivate.h @@ -160,6 +160,7 @@ #include "SandboxPrivate.h" #include "BackstagePass.h" #include "nsCxPusher.h" +#include "nsAXPCNativeCallContext.h" #ifdef XP_WIN // Nasty MS defines diff --git a/layout/style/nsCSSStyleSheet.cpp b/layout/style/nsCSSStyleSheet.cpp index 1edc78d248c..e4712a18bba 100644 --- a/layout/style/nsCSSStyleSheet.cpp +++ b/layout/style/nsCSSStyleSheet.cpp @@ -40,6 +40,7 @@ #include "nsDOMClassInfoID.h" #include "mozilla/Likely.h" #include "mozilla/dom/CSSStyleSheetBinding.h" +#include "nsComponentManagerUtils.h" using namespace mozilla; using namespace mozilla::dom; diff --git a/layout/xul/base/src/nsBoxObject.cpp b/layout/xul/base/src/nsBoxObject.cpp index 67dd1b40cec..90c9ad7477b 100644 --- a/layout/xul/base/src/nsBoxObject.cpp +++ b/layout/xul/base/src/nsBoxObject.cpp @@ -23,6 +23,7 @@ #include "nsISupportsPrimitives.h" #include "nsSupportsPrimitives.h" #include "mozilla/dom/Element.h" +#include "nsComponentManagerUtils.h" using namespace mozilla::dom; diff --git a/layout/xul/tree/nsTreeSelection.cpp b/layout/xul/tree/nsTreeSelection.cpp index e6c6cc89cb8..e51045202c3 100644 --- a/layout/xul/tree/nsTreeSelection.cpp +++ b/layout/xul/tree/nsTreeSelection.cpp @@ -18,6 +18,7 @@ #include "nsAsyncDOMEvent.h" #include "nsEventDispatcher.h" #include "nsAutoPtr.h" +#include "nsComponentManagerUtils.h" // A helper class for managing our ranges of selection. struct nsTreeRange