From bfc35757e1d8b03681ef175d78ae51bcbc7f1c26 Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Sat, 27 Jan 2001 16:58:15 +0000 Subject: [PATCH] Reduce unnecessary #includes to speed up compilation. r=bryner/sfraser sr=alecf b=64023 git-svn-id: svn://10.0.0.236/trunk@85638 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/public/nsIDocument.h | 1 - mozilla/content/base/src/nsDocumentViewer.cpp | 1 + .../html/content/src/nsHTMLBodyElement.cpp | 1 + .../html/document/src/nsHTMLContentSink.cpp | 1 + .../html/document/src/nsHTMLDocument.cpp | 1 + .../content/html/style/src/nsCSSStyleSheet.cpp | 1 + mozilla/dom/src/base/nsGlobalWindow.cpp | 1 + .../extensions/wallet/src/nsWalletService.cpp | 1 + mozilla/layout/base/nsCSSFrameConstructor.cpp | 1 + mozilla/layout/base/nsDocumentViewer.cpp | 1 + mozilla/layout/base/public/nsIDocument.h | 1 - mozilla/layout/base/src/nsDocumentViewer.cpp | 1 + .../html/content/src/nsHTMLBodyElement.cpp | 1 + .../html/document/src/nsHTMLContentSink.cpp | 1 + .../html/document/src/nsHTMLDocument.cpp | 1 + .../html/style/src/nsCSSFrameConstructor.cpp | 1 + .../layout/html/style/src/nsCSSStyleSheet.cpp | 1 + mozilla/layout/style/nsCSSStyleSheet.cpp | 1 + mozilla/mailnews/base/src/nsMsgPrintEngine.cpp | 1 + mozilla/mailnews/base/src/nsMsgWindow.cpp | 2 ++ mozilla/modules/libpref/public/nsIPref.idl | 3 --- .../http/src/nsHTTPResponseListener.cpp | 6 +++--- mozilla/webshell/public/nsIWebShell.h | 18 +----------------- .../webshell/tests/viewer/nsBrowserWindow.cpp | 1 + .../tests/viewer/nsWebBrowserChrome.cpp | 2 ++ .../webshell/tests/viewer/nsXPBaseWindow.cpp | 1 + mozilla/widget/src/mac/nsDynamicMDEF.cpp | 2 ++ 27 files changed, 29 insertions(+), 25 deletions(-) diff --git a/mozilla/content/base/public/nsIDocument.h b/mozilla/content/base/public/nsIDocument.h index 7f3d48423ac..d1d18dfd11d 100644 --- a/mozilla/content/base/public/nsIDocument.h +++ b/mozilla/content/base/public/nsIDocument.h @@ -24,7 +24,6 @@ #include "nslayout.h" #include "nsISupports.h" -#include "nsIUnicharInputStream.h" #include "nsGUIEvent.h" #include "nsAWritableString.h" diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index b337f40a507..49624e661bd 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -79,6 +79,7 @@ #include "nsLayoutAtoms.h" #include "nsIDOMHTMLFrameSetElement.h" #include "nsIFrameManager.h" +#include "nsIParser.h" #include "nsIPrintContext.h" #include "nsIChromeRegistry.h" diff --git a/mozilla/content/html/content/src/nsHTMLBodyElement.cpp b/mozilla/content/html/content/src/nsHTMLBodyElement.cpp index 066c79c28b1..8ff7db5fda6 100644 --- a/mozilla/content/html/content/src/nsHTMLBodyElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLBodyElement.cpp @@ -50,6 +50,7 @@ #include "nsCOMPtr.h" #include "nsIStyleSet.h" #include "nsISizeOfHandler.h" +#include "nsIView.h" //---------------------------------------------------------------------- diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index d9d9166cb65..4e1bbf6ff8d 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -30,6 +30,7 @@ #include "nsICSSLoaderObserver.h" #include "nsIHTMLContent.h" #include "nsIHTMLContentContainer.h" +#include "nsIUnicharInputStream.h" #include "nsIURL.h" #include "nsIStreamLoader.h" #include "nsNetUtil.h" diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 803166a1daa..699991c1e60 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -71,6 +71,7 @@ #include "nsIScriptSecurityManager.h" #include "nsJSUtils.h" #include "nsDOMPropEnums.h" +#include "nsIScrollableView.h" #include "nsIIOService.h" #include "nsICookieService.h" diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp index 3d6d7b0ac09..e7834b207a8 100644 --- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp @@ -43,6 +43,7 @@ #include "nsIFrame.h" #include "nsString.h" #include "nsVoidArray.h" +#include "nsIUnicharInputStream.h" #include "nsHTMLIIDs.h" #include "nsIDOMHTMLAnchorElement.h" #include "nsIDOMHTMLLinkElement.h" diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index 8814ebdc1ab..016f1c909bd 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -87,6 +87,7 @@ #include "nsIServiceManager.h" #include "nsIScriptGlobalObjectOwner.h" #include "nsIScriptSecurityManager.h" +#include "nsIScrollableView.h" #include "nsISelectionController.h" #include "nsISelection.h" #include "nsIFrameSelection.h" diff --git a/mozilla/extensions/wallet/src/nsWalletService.cpp b/mozilla/extensions/wallet/src/nsWalletService.cpp index d9b07ada5ef..c17e00e88d2 100644 --- a/mozilla/extensions/wallet/src/nsWalletService.cpp +++ b/mozilla/extensions/wallet/src/nsWalletService.cpp @@ -43,6 +43,7 @@ #include "nsINetSupportDialogService.h" #include "nsIInterfaceRequestor.h" #include "nsIPrompt.h" +#include "nsIChannel.h" #include "nsIProfileChangeStatus.h" // for making the leap from nsIDOMWindowInternal -> nsIPresShell diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 071e8672d0a..2e634b0492f 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -46,6 +46,7 @@ #include "nsIPresShell.h" #include "nsIStyleSet.h" #include "nsIViewManager.h" +#include "nsIScrollableView.h" #include "nsStyleConsts.h" #include "nsTableOuterFrame.h" #include "nsIXMLDocument.h" diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index b337f40a507..49624e661bd 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -79,6 +79,7 @@ #include "nsLayoutAtoms.h" #include "nsIDOMHTMLFrameSetElement.h" #include "nsIFrameManager.h" +#include "nsIParser.h" #include "nsIPrintContext.h" #include "nsIChromeRegistry.h" diff --git a/mozilla/layout/base/public/nsIDocument.h b/mozilla/layout/base/public/nsIDocument.h index 7f3d48423ac..d1d18dfd11d 100644 --- a/mozilla/layout/base/public/nsIDocument.h +++ b/mozilla/layout/base/public/nsIDocument.h @@ -24,7 +24,6 @@ #include "nslayout.h" #include "nsISupports.h" -#include "nsIUnicharInputStream.h" #include "nsGUIEvent.h" #include "nsAWritableString.h" diff --git a/mozilla/layout/base/src/nsDocumentViewer.cpp b/mozilla/layout/base/src/nsDocumentViewer.cpp index b337f40a507..49624e661bd 100644 --- a/mozilla/layout/base/src/nsDocumentViewer.cpp +++ b/mozilla/layout/base/src/nsDocumentViewer.cpp @@ -79,6 +79,7 @@ #include "nsLayoutAtoms.h" #include "nsIDOMHTMLFrameSetElement.h" #include "nsIFrameManager.h" +#include "nsIParser.h" #include "nsIPrintContext.h" #include "nsIChromeRegistry.h" diff --git a/mozilla/layout/html/content/src/nsHTMLBodyElement.cpp b/mozilla/layout/html/content/src/nsHTMLBodyElement.cpp index 066c79c28b1..8ff7db5fda6 100644 --- a/mozilla/layout/html/content/src/nsHTMLBodyElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLBodyElement.cpp @@ -50,6 +50,7 @@ #include "nsCOMPtr.h" #include "nsIStyleSet.h" #include "nsISizeOfHandler.h" +#include "nsIView.h" //---------------------------------------------------------------------- diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp index d9d9166cb65..4e1bbf6ff8d 100644 --- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp @@ -30,6 +30,7 @@ #include "nsICSSLoaderObserver.h" #include "nsIHTMLContent.h" #include "nsIHTMLContentContainer.h" +#include "nsIUnicharInputStream.h" #include "nsIURL.h" #include "nsIStreamLoader.h" #include "nsNetUtil.h" diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp index 803166a1daa..699991c1e60 100644 --- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp @@ -71,6 +71,7 @@ #include "nsIScriptSecurityManager.h" #include "nsJSUtils.h" #include "nsDOMPropEnums.h" +#include "nsIScrollableView.h" #include "nsIIOService.h" #include "nsICookieService.h" diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 071e8672d0a..2e634b0492f 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -46,6 +46,7 @@ #include "nsIPresShell.h" #include "nsIStyleSet.h" #include "nsIViewManager.h" +#include "nsIScrollableView.h" #include "nsStyleConsts.h" #include "nsTableOuterFrame.h" #include "nsIXMLDocument.h" diff --git a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp index 3d6d7b0ac09..e7834b207a8 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp @@ -43,6 +43,7 @@ #include "nsIFrame.h" #include "nsString.h" #include "nsVoidArray.h" +#include "nsIUnicharInputStream.h" #include "nsHTMLIIDs.h" #include "nsIDOMHTMLAnchorElement.h" #include "nsIDOMHTMLLinkElement.h" diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp index 3d6d7b0ac09..e7834b207a8 100644 --- a/mozilla/layout/style/nsCSSStyleSheet.cpp +++ b/mozilla/layout/style/nsCSSStyleSheet.cpp @@ -43,6 +43,7 @@ #include "nsIFrame.h" #include "nsString.h" #include "nsVoidArray.h" +#include "nsIUnicharInputStream.h" #include "nsHTMLIIDs.h" #include "nsIDOMHTMLAnchorElement.h" #include "nsIDOMHTMLLinkElement.h" diff --git a/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp b/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp index 1891b477921..add6c20c352 100644 --- a/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp +++ b/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp @@ -48,6 +48,7 @@ #include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeNode.h" #include "nsIWebNavigation.h" +#include "nsIChannel.h" ///////////////////////////////////////////////////////////////////////// // nsMsgPrintEngine implementation diff --git a/mozilla/mailnews/base/src/nsMsgWindow.cpp b/mozilla/mailnews/base/src/nsMsgWindow.cpp index ae38b890e34..6cafea56bfd 100644 --- a/mozilla/mailnews/base/src/nsMsgWindow.cpp +++ b/mozilla/mailnews/base/src/nsMsgWindow.cpp @@ -41,6 +41,8 @@ #include "nsIPrompt.h" #include "nsICharsetConverterManager.h" #include "nsICharsetConverterManager2.h" +#include "nsIChannel.h" +#include "nsIStreamObserver.h" #include "plbase64.h" #include "nsMsgI18N.h" diff --git a/mozilla/modules/libpref/public/nsIPref.idl b/mozilla/modules/libpref/public/nsIPref.idl index b2f19f686c9..1a545efb4b3 100644 --- a/mozilla/modules/libpref/public/nsIPref.idl +++ b/mozilla/modules/libpref/public/nsIPref.idl @@ -25,7 +25,6 @@ #include "nsIObserver.idl" %{C++ -#include "jsapi.h" typedef int (*PR_CALLBACK PrefChangedFunc)(const char *, void *); @@ -46,8 +45,6 @@ typedef void (*PrefEnumerationFunc)(const char *, void *); #define NS_PREF_VALUE_CHANGED 1 %} -[ptr] native JSContext(JSContext); -[ptr] native JSObject(JSObject); native PrefChangedFunc(PrefChangedFunc); native PrefEnumerationFunc(PrefEnumerationFunc); diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp index af33b305ee5..9970b1fe959 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp @@ -443,9 +443,9 @@ nsHTTPServerListener::OnDataAvailable(nsIChannel* channel, const char * cp = mHeaderBuffer.GetBuffer() ; nsCOMPtr is; - nsresult rv1 = - NS_NewByteArrayInputStream(getter_AddRefs(is) , strdup(cp) , - mHeaderBuffer.Length()) ; + nsresult rv1 = NS_NewByteArrayInputStream(getter_AddRefs(is), + nsCRT::strdup(cp), + mHeaderBuffer.Length()); NS_ASSERTION(mResponseDataListener, "No data listener! Did we abort?"); if (NS_SUCCEEDED(rv1) && mResponseDataListener) diff --git a/mozilla/webshell/public/nsIWebShell.h b/mozilla/webshell/public/nsIWebShell.h index f532f1fc8a6..68f40ac89c5 100644 --- a/mozilla/webshell/public/nsIWebShell.h +++ b/mozilla/webshell/public/nsIWebShell.h @@ -22,26 +22,10 @@ #ifndef nsIWebShell_h___ #define nsIWebShell_h___ -#include "nsIWidget.h" -#include "nsIParser.h" -#include "nsIScrollableView.h" #include "nsIContentViewerContainer.h" -#include "nsIChannel.h" -#include "nsIScrollableView.h" -class nsIDOMElement; -class nsIDOMWindowInternal; -class nsIFactory; -//class nsIPostData; -class nsIStreamObserver; class nsIDocumentLoader; -class nsIDocumentLoaderObserver; -class nsIWebShell; -class nsIWebShellContainer; -class nsIContent; -class nsIURIContentListener; -class nsIDOMDocument; -class nsIChromeEventHandler; +class nsIURI; // Interface ID for nsIWebShell #define NS_IWEB_SHELL_IID \ diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index 20ef3475262..09fcfd8d199 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -75,6 +75,7 @@ #include "nsIWebNavigation.h" #include "nsIBaseWindow.h" #include "nsXPIDLString.h" +#include "nsIViewManager.h" #include "nsCWebBrowser.h" diff --git a/mozilla/webshell/tests/viewer/nsWebBrowserChrome.cpp b/mozilla/webshell/tests/viewer/nsWebBrowserChrome.cpp index 62d2fda5432..c47aa057a1e 100644 --- a/mozilla/webshell/tests/viewer/nsWebBrowserChrome.cpp +++ b/mozilla/webshell/tests/viewer/nsWebBrowserChrome.cpp @@ -34,6 +34,8 @@ // Interfaces needed to be included #include "nsIDocShellTreeItem.h" #include "nsIWebProgress.h" +#include "nsIChannel.h" +#include "nsIURI.h" // CIDs diff --git a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp index 3b1105efdc4..32416029ef6 100644 --- a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp @@ -58,6 +58,7 @@ #include "nsIWindowListener.h" #include "nsIBaseWindow.h" #include "nsIWebNavigation.h" +#include "nsIViewManager.h" #include "nsIDocShell.h" #include "nsIDocShellTreeItem.h" diff --git a/mozilla/widget/src/mac/nsDynamicMDEF.cpp b/mozilla/widget/src/mac/nsDynamicMDEF.cpp index 0a6edd07339..7e2b09d8a9a 100644 --- a/mozilla/widget/src/mac/nsDynamicMDEF.cpp +++ b/mozilla/widget/src/mac/nsDynamicMDEF.cpp @@ -22,6 +22,8 @@ #include "nsDynamicMDEF.h" +#include "prinrval.h" + #include "nsCOMPtr.h" #include "nsIDOMElement.h" #include "nsIDOMNode.h"