From 8db35965a8406e4f9388e5c39d92081f84db2ecb Mon Sep 17 00:00:00 2001 From: "valeski%netscape.com" Date: Wed, 5 Sep 2001 21:28:38 +0000 Subject: [PATCH] r=dbaron, sr=dougt. 97667. nsIInterfaceRequestor is now frozen. nsIInterfaceRequestorUtils.h is now required if you want to use do_GetInterface() for convenience. The two were split because the stuff that is now in nsIInterfaceRequestorUtils.h wasn't ready for freezing. Also, .idl files should just contain interface defs anyway. git-svn-id: svn://10.0.0.236/trunk@102327 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsDocument.cpp | 2 +- mozilla/content/base/src/nsDocumentViewer.cpp | 1 + mozilla/content/events/src/nsDOMEvent.cpp | 1 + .../html/document/src/nsHTMLContentSink.cpp | 1 + .../content/xml/document/src/nsXMLDocument.h | 1 + .../directory/xpcom/base/src/nsLDAPChannel.h | 1 + mozilla/docshell/base/nsDocShell.h | 1 + mozilla/docshell/base/nsWebShell.cpp | 1 + mozilla/dom/src/base/nsDOMClassInfo.cpp | 1 + mozilla/dom/src/base/nsDOMWindowList.cpp | 1 + mozilla/dom/src/base/nsGlobalWindow.h | 1 + mozilla/dom/src/base/nsJSEnvironment.cpp | 1 + mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp | 1 + mozilla/editor/base/nsComposerController.h | 1 + mozilla/editor/base/nsEditorController.h | 1 + .../composer/src/nsComposerController.h | 1 + .../editor/composer/src/nsEditingSession.cp | 1 + .../libeditor/base/nsEditorController.h | 1 + .../browser/activex/src/control/StdAfx.h | 1 + .../src/nsUnknownContentTypeHandler.cpp | 1 + .../embedding/browser/photon/src/stdhdrs.h | 1 + .../powerplant/source/CBrowserShell.cpp | 1 + .../powerplant/source/CWebBrowserChrome.h | 1 + .../browser/webBrowser/nsDocShellTreeOwner.h | 1 + .../browser/webBrowser/nsWebBrowser.cpp | 1 + .../browser/webBrowser/nsWebBrowser.h | 1 + .../components/find/src/nsWebBrowserFind.cpp | 1 + mozilla/embedding/qa/testembed/StdAfx.h | 1 + .../tests/gtkEmbed/WebBrowserChrome.h | 1 + mozilla/embedding/tests/mfcembed/StdAfx.h | 1 + .../mfcembed/components/HelperAppDlg.cpp | 1 + .../tests/winEmbed/WebBrowserChrome.cpp | 1 + .../tests/winEmbed/WebBrowserChrome.h | 1 + .../extensions/cookie/nsCookieHTTPNotify.cpp | 1 + .../extensions/datetime/nsDateTimeChannel.cpp | 1 + .../extensions/datetime/nsDateTimeChannel.h | 1 + .../extensions/datetime/nsDateTimeHandler.cpp | 1 + mozilla/extensions/finger/nsFingerChannel.cpp | 1 + mozilla/extensions/finger/nsFingerChannel.h | 1 + mozilla/extensions/finger/nsFingerHandler.cpp | 1 + .../inspector/base/src/inBitmapChannel.cpp | 1 + .../inspector/base/src/inBitmapChannel.h | 1 + .../extensions/p3p/src/nsP3PHTTPNotify.cpp | 1 + mozilla/extensions/p3p/src/nsP3PUI.cpp | 1 + .../extensions/wallet/src/nsWalletService.cpp | 1 + .../xmlextras/base/src/nsXMLHttpRequest.cpp | 1 + .../xmlterm/base/mozXMLTermUtils.cpp | 1 + .../xmlterm/base/mozXMLTerminal.cpp | 1 + mozilla/gfx/src/nsRenderingContextImpl.cpp | 1 + mozilla/gfx/src/ps/nsRenderingContextPS.cpp | 1 + mozilla/gfx/src/shared/gfxImageFrame.h | 1 + .../gfx/src/shared/nsRenderingContextImpl.cpp | 1 + .../gfx/src/xlib/nsRenderingContextXlib.cpp | 1 + .../gfx/src/xprint/nsRenderingContextXP.cpp | 1 + mozilla/gfx2/src/gfxImageFrame.h | 1 + mozilla/htmlparser/robot/nsDebugRobot.cpp | 1 + mozilla/layout/base/nsDocumentViewer.cpp | 1 + mozilla/layout/base/nsPresContext.cpp | 1 + mozilla/layout/base/src/nsPresContext.cpp | 1 + .../mathml/base/src/nsMathMLmactionFrame.cpp | 1 + mozilla/mailnews/absync/src/nsAbSync.cpp | 1 + .../mailnews/absync/src/nsAbSyncPostEngine.h | 1 + .../mailnews/base/src/nsMsgPrintEngine.cpp | 1 + mozilla/mailnews/base/src/nsMsgWindow.cpp | 1 + mozilla/mailnews/base/util/nsMsgDBFolder.cpp | 1 + mozilla/mailnews/base/util/nsMsgFolder.cpp | 1 + .../base/util/nsMsgIncomingServer.cpp | 1 + .../mailnews/base/util/nsMsgMailNewsUrl.cpp | 1 + mozilla/mailnews/base/util/nsMsgProtocol.h | 1 + mozilla/mailnews/compose/src/nsMsgSend.cpp | 1 + mozilla/mailnews/compose/src/nsSmtpUrl.h | 1 + mozilla/mailnews/compose/src/nsURLFetcher.h | 1 + .../mailnews/imap/src/nsImapMailFolder.cpp | 1 + mozilla/mailnews/imap/src/nsImapProtocol.h | 1 + mozilla/mailnews/imap/src/nsImapUrl.cpp | 1 + .../mailnews/local/src/nsLocalMailFolder.cpp | 1 + .../mime/emitters/src/nsMimeBaseEmitter.h | 1 + .../mailnews/mime/src/nsStreamConverter.cpp | 1 + .../mailnews/news/src/nsNNTPNewsgroupList.cpp | 1 + mozilla/mailnews/news/src/nsNewsFolder.cpp | 1 + mozilla/modules/libjar/nsJARChannel.h | 1 + .../decoders/icon/mac/nsIconChannel.cpp | 1 + .../libpr0n/decoders/icon/mac/nsIconChannel.h | 1 + .../decoders/icon/win/nsIconChannel.cpp | 1 + .../libpr0n/decoders/icon/win/nsIconChannel.h | 1 + .../libpr0n/decoders/mng/imgContainerMNG.cpp | 1 + mozilla/modules/libpr0n/src/imgContainer.cpp | 1 + mozilla/modules/oji/src/nsJVMManager.cpp | 1 + .../plugin/base/src/nsPluginViewer.cpp | 1 + mozilla/netwerk/base/public/nsNetUtil.h | 1 + mozilla/netwerk/base/src/nsFileTransport.cpp | 1 + mozilla/netwerk/base/src/nsFileTransport.h | 1 + .../netwerk/base/src/nsInputStreamChannel.h | 1 + mozilla/netwerk/base/src/nsLoadGroup.h | 1 + .../netwerk/base/src/nsSocketTransport.cpp | 1 + mozilla/netwerk/base/src/nsSocketTransport.h | 1 + mozilla/netwerk/base/src/nsStorageTransport.h | 1 + .../cache/src/nsCacheEntryDescriptor.h | 1 + .../protocol/data/src/nsDataChannel.cpp | 1 + .../netwerk/protocol/data/src/nsDataChannel.h | 1 + .../protocol/data/src/nsDataHandler.cpp | 1 + .../datetime/src/nsDateTimeChannel.cpp | 1 + .../protocol/datetime/src/nsDateTimeChannel.h | 1 + .../datetime/src/nsDateTimeHandler.cpp | 1 + .../netwerk/protocol/file/src/nsFileChannel.h | 1 + .../file/src/nsFileProtocolHandler.cpp | 1 + .../protocol/finger/src/nsFingerChannel.cpp | 1 + .../protocol/finger/src/nsFingerChannel.h | 1 + .../protocol/finger/src/nsFingerHandler.cpp | 1 + .../netwerk/protocol/ftp/src/nsFTPChannel.h | 1 + .../ftp/src/nsFtpConnectionThread.cpp | 1 + .../protocol/ftp/src/nsFtpProtocolHandler.cpp | 1 + .../protocol/gopher/src/nsGopherChannel.cpp | 1 + .../protocol/gopher/src/nsGopherChannel.h | 1 + .../protocol/gopher/src/nsGopherHandler.cpp | 1 + .../netwerk/protocol/http/src/nsHttpChannel.h | 1 + .../protocol/http/src/nsHttpConnection.h | 1 + .../protocol/http/src/nsHttpTransaction.h | 1 + .../netwerk/protocol/jar/src/nsJARChannel.h | 1 + .../netwerk/protocol/res/src/nsResChannel.h | 1 + .../viewsource/src/nsViewSourceChannel.cpp | 1 + mozilla/netwerk/test/TestCallbacks.cpp | 1 + mozilla/netwerk/test/TestFileTransport.cpp | 1 + mozilla/netwerk/test/TestHttp.cpp | 1 + mozilla/netwerk/test/TestPageLoad.cpp | 1 + mozilla/netwerk/test/TestProtocols.cpp | 1 + mozilla/netwerk/test/TestSocketTransport.cpp | 1 + .../parser/htmlparser/robot/nsDebugRobot.cpp | 1 + mozilla/profile/src/nsProfile.h | 1 + mozilla/uriloader/base/nsDocLoader.h | 1 + mozilla/uriloader/base/nsURILoader.cpp | 1 + mozilla/uriloader/base/nsURILoader.h | 1 + .../exthandler/nsExternalHelperAppService.h | 1 + mozilla/webshell/tests/viewer/nsViewerApp.cpp | 1 + .../tests/viewer/nsWebBrowserChrome.h | 1 + .../widget/src/gtk/nsGtkMozRemoteHelper.cpp | 1 + mozilla/xpcom/base/MANIFEST | 1 + mozilla/xpcom/base/Makefile.in | 1 + mozilla/xpcom/base/makefile.win | 1 + mozilla/xpcom/base/nsIInterfaceRequestor.cpp | 1 + mozilla/xpcom/base/nsIInterfaceRequestor.idl | 82 +++++-------------- .../xpcom/base/nsIInterfaceRequestorUtils.h | 67 +++++++++++++++ mozilla/xpcom/build/dlldeps.cpp | 1 + mozilla/xpcom/components/nsComponentManager.h | 1 + .../xpcom/glue/nsIInterfaceRequestorUtils.h | 67 +++++++++++++++ mozilla/xpcom/tests/TestCallTemplates.cpp | 1 + .../src/nsAppShellWindowEnumerator.cpp | 1 + mozilla/xpfe/appshell/src/nsChromeTreeOwner.h | 1 + .../xpfe/appshell/src/nsContentTreeOwner.h | 1 + .../xpfe/appshell/src/nsWindowMediator.cpp | 1 + mozilla/xpfe/appshell/src/nsXULWindow.cpp | 1 + mozilla/xpfe/appshell/src/nsXULWindow.h | 1 + .../xpfe/bootstrap/nsNativeAppSupportWin.cpp | 1 + mozilla/xpfe/bootstrap/nsWindowCreator.cpp | 1 + .../directory/nsDirectoryViewer.cpp | 2 +- .../ucth/src/nsUnknownContentTypeHandler.cpp | 1 + .../xpfe/components/xfer/src/nsStreamXferOp.h | 1 + mozilla/xpinstall/src/nsXPInstallManager.h | 1 + 158 files changed, 309 insertions(+), 64 deletions(-) create mode 100644 mozilla/xpcom/base/nsIInterfaceRequestorUtils.h create mode 100644 mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 9c2c9fb7a99..2c88ce58951 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -26,6 +26,7 @@ #include "nsCOMPtr.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsDocument.h" #include "nsIArena.h" #include "nsIURL.h" @@ -96,7 +97,6 @@ #include "nsIAggregatePrincipal.h" #include "nsIPrivateDOMImplementation.h" -#include "nsIInterfaceRequestor.h" #include "nsIDOMWindowInternal.h" #include "nsPIDOMWindow.h" #include "nsIFocusController.h" diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index 8f0d559cabb..c39a9a8bb9f 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -71,6 +71,7 @@ #include "nsIContentViewerFile.h" #include "nsIMarkupDocumentViewer.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeNode.h" #include "nsIDocShellTreeOwner.h" diff --git a/mozilla/content/events/src/nsDOMEvent.cpp b/mozilla/content/events/src/nsDOMEvent.cpp index 80cb1479322..3f4a9d9a9e3 100644 --- a/mozilla/content/events/src/nsDOMEvent.cpp +++ b/mozilla/content/events/src/nsDOMEvent.cpp @@ -37,6 +37,7 @@ #include "nsIScrollableView.h" #include "nsIDOMEventTarget.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDOMWindowInternal.h" #include "nsIDOMAbstractView.h" #include "prmem.h" diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index 6b0f7953676..4d0a542aa81 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -25,6 +25,7 @@ #include "nsXPIDLString.h" #include "nsIHTMLContentSink.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIParser.h" #include "nsParserUtils.h" #include "nsICSSStyleSheet.h" diff --git a/mozilla/content/xml/document/src/nsXMLDocument.h b/mozilla/content/xml/document/src/nsXMLDocument.h index 6dca652e14d..13d37a2e819 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.h +++ b/mozilla/content/xml/document/src/nsXMLDocument.h @@ -27,6 +27,7 @@ #include "nsIXMLDocument.h" #include "nsIHTMLContentContainer.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIHttpEventSink.h" class nsIParser; diff --git a/mozilla/directory/xpcom/base/src/nsLDAPChannel.h b/mozilla/directory/xpcom/base/src/nsLDAPChannel.h index df966151abf..4b6a07eca05 100644 --- a/mozilla/directory/xpcom/base/src/nsLDAPChannel.h +++ b/mozilla/directory/xpcom/base/src/nsLDAPChannel.h @@ -44,6 +44,7 @@ #include "nsIInputStream.h" #include "nsIOutputStream.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIStreamListener.h" #include "nsILDAPMessageListener.h" #include "nsIProgressEventSink.h" diff --git a/mozilla/docshell/base/nsDocShell.h b/mozilla/docshell/base/nsDocShell.h index 5d641ae7e92..0a906c90937 100644 --- a/mozilla/docshell/base/nsDocShell.h +++ b/mozilla/docshell/base/nsDocShell.h @@ -59,6 +59,7 @@ #include "nsIDocCharset.h" #include "nsIGlobalHistory.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIPrompt.h" #include "nsIRefreshURI.h" #include "nsIScriptGlobalObject.h" diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 069bf2b3be0..f8ee5a584af 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -35,6 +35,7 @@ typedef unsigned long HMTX; #include "nsWebShell.h" #include "nsIWebBrowserChrome.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIWebProgress.h" #include "nsIDocumentLoader.h" #include "nsIDocumentLoaderFactory.h" diff --git a/mozilla/dom/src/base/nsDOMClassInfo.cpp b/mozilla/dom/src/base/nsDOMClassInfo.cpp index 37dae2f4d44..57ec6f19ec4 100644 --- a/mozilla/dom/src/base/nsDOMClassInfo.cpp +++ b/mozilla/dom/src/base/nsDOMClassInfo.cpp @@ -53,6 +53,7 @@ #include "nsIScriptExternalNameSet.h" #include "nsJSUtils.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsScriptNameSpaceManager.h" #include "nsIScriptObjectOwner.h" #include "nsIJSNativeInitializer.h" diff --git a/mozilla/dom/src/base/nsDOMWindowList.cpp b/mozilla/dom/src/base/nsDOMWindowList.cpp index 54bc0306dc5..49cdbe31ddf 100644 --- a/mozilla/dom/src/base/nsDOMWindowList.cpp +++ b/mozilla/dom/src/base/nsDOMWindowList.cpp @@ -35,6 +35,7 @@ #include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeNode.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIScriptGlobalObject.h" #include "nsIWebNavigation.h" diff --git a/mozilla/dom/src/base/nsGlobalWindow.h b/mozilla/dom/src/base/nsGlobalWindow.h index a69e62a5c15..39852a91374 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.h +++ b/mozilla/dom/src/base/nsGlobalWindow.h @@ -46,6 +46,7 @@ #include "nsIDOMNSLocation.h" #include "nsIDOMWindowInternal.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDOMJSWindow.h" #include "nsIScriptGlobalObject.h" #include "nsIScriptObjectPrincipal.h" diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp index a7e45f21bd0..3d70eaf883b 100644 --- a/mozilla/dom/src/base/nsJSEnvironment.cpp +++ b/mozilla/dom/src/base/nsJSEnvironment.cpp @@ -50,6 +50,7 @@ #include "nsIPresContext.h" #include "nsIScriptError.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIPrompt.h" #include "nsIObserverService.h" #include "nsGUIEvent.h" diff --git a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp index ce2711f015d..bcdc4156d43 100644 --- a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp +++ b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp @@ -39,6 +39,7 @@ #include "nsIScriptSecurityManager.h" #include "nsICodebasePrincipal.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIByteArrayInputStream.h" #include "nsIWindowMediator.h" #include "nsIDOMWindowInternal.h" diff --git a/mozilla/editor/base/nsComposerController.h b/mozilla/editor/base/nsComposerController.h index ce35e5a0b74..8474db5935a 100644 --- a/mozilla/editor/base/nsComposerController.h +++ b/mozilla/editor/base/nsComposerController.h @@ -30,6 +30,7 @@ #include "nsIEditorController.h" #include "nsIController.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIControllerCommand.h" #include "nsWeakPtr.h" diff --git a/mozilla/editor/base/nsEditorController.h b/mozilla/editor/base/nsEditorController.h index dbf3f9e3982..20638f00295 100644 --- a/mozilla/editor/base/nsEditorController.h +++ b/mozilla/editor/base/nsEditorController.h @@ -31,6 +31,7 @@ #include "nsIEditorController.h" #include "nsIControllerCommand.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsHashtable.h" #include "nsString.h" diff --git a/mozilla/editor/composer/src/nsComposerController.h b/mozilla/editor/composer/src/nsComposerController.h index ce35e5a0b74..8474db5935a 100644 --- a/mozilla/editor/composer/src/nsComposerController.h +++ b/mozilla/editor/composer/src/nsComposerController.h @@ -30,6 +30,7 @@ #include "nsIEditorController.h" #include "nsIController.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIControllerCommand.h" #include "nsWeakPtr.h" diff --git a/mozilla/editor/composer/src/nsEditingSession.cp b/mozilla/editor/composer/src/nsEditingSession.cp index 8e334f60d69..8b81df362fd 100644 --- a/mozilla/editor/composer/src/nsEditingSession.cp +++ b/mozilla/editor/composer/src/nsEditingSession.cp @@ -46,6 +46,7 @@ #include "nsIComponentManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #if DEBUG #define NOISY_DOC_LOADING 1 diff --git a/mozilla/editor/libeditor/base/nsEditorController.h b/mozilla/editor/libeditor/base/nsEditorController.h index dbf3f9e3982..20638f00295 100644 --- a/mozilla/editor/libeditor/base/nsEditorController.h +++ b/mozilla/editor/libeditor/base/nsEditorController.h @@ -31,6 +31,7 @@ #include "nsIEditorController.h" #include "nsIControllerCommand.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsHashtable.h" #include "nsString.h" diff --git a/mozilla/embedding/browser/activex/src/control/StdAfx.h b/mozilla/embedding/browser/activex/src/control/StdAfx.h index 25a23ffb9a9..d126955387c 100644 --- a/mozilla/embedding/browser/activex/src/control/StdAfx.h +++ b/mozilla/embedding/browser/activex/src/control/StdAfx.h @@ -75,6 +75,7 @@ #include "nsIContentViewer.h" #include "nsIContentViewerEdit.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIPresShell.h" #include "nsCOMPtr.h" #include "nsISelection.h" diff --git a/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp b/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp index 2146714ac46..4be26a07f23 100644 --- a/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp +++ b/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp @@ -25,6 +25,7 @@ #include "nsIDOMWindowInternal.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDocShell.h" #include "nsIMIMEInfo.h" #include "nsIURI.h" diff --git a/mozilla/embedding/browser/photon/src/stdhdrs.h b/mozilla/embedding/browser/photon/src/stdhdrs.h index 69efbe42603..937963ceb18 100644 --- a/mozilla/embedding/browser/photon/src/stdhdrs.h +++ b/mozilla/embedding/browser/photon/src/stdhdrs.h @@ -62,6 +62,7 @@ #include "nsISearchContext.h" #include "nsIContentViewerEdit.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIPresShell.h" #include "nsCOMPtr.h" #include "nsISelection.h" diff --git a/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp b/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp index d22c8a3523e..0ddf46d3d57 100644 --- a/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp +++ b/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp @@ -34,6 +34,7 @@ #include "nsIDocShell.h" #include "nsIDocShellTreeOwner.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIWebProgressListener.h" #include "nsIServiceManager.h" #include "nsIClipboardCommands.h" diff --git a/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.h b/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.h index ba4b7a6859b..16c50879812 100644 --- a/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.h +++ b/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.h @@ -33,6 +33,7 @@ #include "nsIWebProgressListener.h" #include "nsIEmbeddingSiteWindow.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIPrompt.h" #include "nsIContextMenuListener.h" #include "nsITooltipListener.h" diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h index 71c9445975b..6420333e0e4 100644 --- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h +++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h @@ -31,6 +31,7 @@ #include "nsIBaseWindow.h" #include "nsIDocShellTreeOwner.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIWebBrowserChrome.h" #include "nsIDOMMouseListener.h" #include "nsIDOMDocument.h" diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp index d01ebe76e50..0d58abb5e9e 100644 --- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp +++ b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp @@ -35,6 +35,7 @@ #include "nsIDOMWindow.h" #include "nsIDOMElement.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIWebBrowserChrome.h" #include "nsIWebShell.h" #include "nsPIDOMWindow.h" diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.h b/mozilla/embedding/browser/webBrowser/nsWebBrowser.h index 102a3f4ffc3..b8d7cabd08a 100644 --- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.h +++ b/mozilla/embedding/browser/webBrowser/nsWebBrowser.h @@ -35,6 +35,7 @@ #include "nsIDocShell.h" #include "nsIDocShellTreeItem.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIScrollable.h" #include "nsISHistory.h" #include "nsITextScroll.h" diff --git a/mozilla/embedding/components/find/src/nsWebBrowserFind.cpp b/mozilla/embedding/components/find/src/nsWebBrowserFind.cpp index 1ae3d01197d..79a3e211efb 100644 --- a/mozilla/embedding/components/find/src/nsWebBrowserFind.cpp +++ b/mozilla/embedding/components/find/src/nsWebBrowserFind.cpp @@ -29,6 +29,7 @@ #include "nsTextServicesCID.h" #include "nsIScriptGlobalObject.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDOMWindow.h" #include "nsIDOMWindowInternal.h" #include "nsPIDOMWindow.h" diff --git a/mozilla/embedding/qa/testembed/StdAfx.h b/mozilla/embedding/qa/testembed/StdAfx.h index c3a2068edf0..41bb2f8378e 100644 --- a/mozilla/embedding/qa/testembed/StdAfx.h +++ b/mozilla/embedding/qa/testembed/StdAfx.h @@ -59,6 +59,7 @@ #include "nsIWebProgress.h" #include "nsIWindowCreator.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDocShellTreeOwner.h" #include "nsIDocShellTreeItem.h" #include "nsIClipboardCommands.h" diff --git a/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.h b/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.h index ad4046378fe..2ffe4dbf61a 100644 --- a/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.h +++ b/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.h @@ -36,6 +36,7 @@ #include "nsIWebNavigation.h" #include "nsIWebProgressListener.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIPrompt.h" #include "nsIWebBrowser.h" #include "nsVoidArray.h" diff --git a/mozilla/embedding/tests/mfcembed/StdAfx.h b/mozilla/embedding/tests/mfcembed/StdAfx.h index 5f808067b99..8c1b701bda7 100644 --- a/mozilla/embedding/tests/mfcembed/StdAfx.h +++ b/mozilla/embedding/tests/mfcembed/StdAfx.h @@ -59,6 +59,7 @@ #include "nsIWebProgress.h" #include "nsIWindowCreator.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDocShellTreeOwner.h" #include "nsIDocShellTreeItem.h" #include "nsIClipboardCommands.h" diff --git a/mozilla/embedding/tests/mfcembed/components/HelperAppDlg.cpp b/mozilla/embedding/tests/mfcembed/components/HelperAppDlg.cpp index d9ed7e250a0..9db15e3827b 100644 --- a/mozilla/embedding/tests/mfcembed/components/HelperAppDlg.cpp +++ b/mozilla/embedding/tests/mfcembed/components/HelperAppDlg.cpp @@ -34,6 +34,7 @@ #include "nsIServiceManager.h" #include "nsIWebBrowserChrome.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" // This file contains code which overrides the default // Gecko implementation for helper app dialog handling diff --git a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp index 366b5924578..ead6ec876a5 100644 --- a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp +++ b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp @@ -30,6 +30,7 @@ #include "nsIDOMWindow.h" #include "nsIDOMWindowInternal.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIRequest.h" #include "nsIChannel.h" #include "nsCWebBrowser.h" diff --git a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.h b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.h index 038f00c98eb..5f3cb83a0e5 100644 --- a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.h +++ b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.h @@ -36,6 +36,7 @@ #include "nsIWebNavigation.h" #include "nsIWebProgressListener.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIWebBrowser.h" #include "nsIObserver.h" #include "nsWeakReference.h" diff --git a/mozilla/extensions/cookie/nsCookieHTTPNotify.cpp b/mozilla/extensions/cookie/nsCookieHTTPNotify.cpp index bbff4e4a773..7679eef8536 100644 --- a/mozilla/extensions/cookie/nsCookieHTTPNotify.cpp +++ b/mozilla/extensions/cookie/nsCookieHTTPNotify.cpp @@ -38,6 +38,7 @@ #include "nsICategoryManager.h" #include "nsIHttpProtocolHandler.h" // for NS_HTTP_STARTUP_CATEGORY #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIPrompt.h" static NS_DEFINE_CID(kINetModuleMgrCID, NS_NETMODULEMGR_CID); diff --git a/mozilla/extensions/datetime/nsDateTimeChannel.cpp b/mozilla/extensions/datetime/nsDateTimeChannel.cpp index caa75b8e617..c99ff7c547e 100644 --- a/mozilla/extensions/datetime/nsDateTimeChannel.cpp +++ b/mozilla/extensions/datetime/nsDateTimeChannel.cpp @@ -27,6 +27,7 @@ #include "nsIServiceManager.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsXPIDLString.h" #include "nsISocketTransportService.h" #include "nsITransport.h" diff --git a/mozilla/extensions/datetime/nsDateTimeChannel.h b/mozilla/extensions/datetime/nsDateTimeChannel.h index 1caf8c24de9..b7118239f65 100644 --- a/mozilla/extensions/datetime/nsDateTimeChannel.h +++ b/mozilla/extensions/datetime/nsDateTimeChannel.h @@ -31,6 +31,7 @@ #include "nsILoadGroup.h" #include "nsIInputStream.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsCOMPtr.h" #include "nsXPIDLString.h" #include "nsIChannel.h" diff --git a/mozilla/extensions/datetime/nsDateTimeHandler.cpp b/mozilla/extensions/datetime/nsDateTimeHandler.cpp index 0e609fc3223..1a1ebf48cf0 100644 --- a/mozilla/extensions/datetime/nsDateTimeHandler.cpp +++ b/mozilla/extensions/datetime/nsDateTimeHandler.cpp @@ -28,6 +28,7 @@ #include "nsIComponentManager.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #include "nsNetCID.h" diff --git a/mozilla/extensions/finger/nsFingerChannel.cpp b/mozilla/extensions/finger/nsFingerChannel.cpp index d9fe1684832..7e6898a56b9 100644 --- a/mozilla/extensions/finger/nsFingerChannel.cpp +++ b/mozilla/extensions/finger/nsFingerChannel.cpp @@ -26,6 +26,7 @@ #include "nsIServiceManager.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsXPIDLString.h" #include "nsISocketTransportService.h" #include "nsIStringStream.h" diff --git a/mozilla/extensions/finger/nsFingerChannel.h b/mozilla/extensions/finger/nsFingerChannel.h index ff8b7bccebd..9086ec00aa1 100644 --- a/mozilla/extensions/finger/nsFingerChannel.h +++ b/mozilla/extensions/finger/nsFingerChannel.h @@ -27,6 +27,7 @@ #include "nsILoadGroup.h" #include "nsIInputStream.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsCOMPtr.h" #include "nsXPIDLString.h" #include "nsIChannel.h" diff --git a/mozilla/extensions/finger/nsFingerHandler.cpp b/mozilla/extensions/finger/nsFingerHandler.cpp index 5ed8c49d4e4..3a61fd1fe1c 100644 --- a/mozilla/extensions/finger/nsFingerHandler.cpp +++ b/mozilla/extensions/finger/nsFingerHandler.cpp @@ -28,6 +28,7 @@ #include "nsIComponentManager.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #include "nsNetCID.h" diff --git a/mozilla/extensions/inspector/base/src/inBitmapChannel.cpp b/mozilla/extensions/inspector/base/src/inBitmapChannel.cpp index cadeb2b689d..6a9a68264be 100644 --- a/mozilla/extensions/inspector/base/src/inBitmapChannel.cpp +++ b/mozilla/extensions/inspector/base/src/inBitmapChannel.cpp @@ -24,6 +24,7 @@ #include "inIBitmapURI.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsXPIDLString.h" #include "nsMemory.h" #include "nsIStringStream.h" diff --git a/mozilla/extensions/inspector/base/src/inBitmapChannel.h b/mozilla/extensions/inspector/base/src/inBitmapChannel.h index 59b05b77806..4874415275f 100644 --- a/mozilla/extensions/inspector/base/src/inBitmapChannel.h +++ b/mozilla/extensions/inspector/base/src/inBitmapChannel.h @@ -28,6 +28,7 @@ #include "nsIChannel.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIURI.h" class nsIFile; diff --git a/mozilla/extensions/p3p/src/nsP3PHTTPNotify.cpp b/mozilla/extensions/p3p/src/nsP3PHTTPNotify.cpp index 55bde484a46..b80e7a26c69 100644 --- a/mozilla/extensions/p3p/src/nsP3PHTTPNotify.cpp +++ b/mozilla/extensions/p3p/src/nsP3PHTTPNotify.cpp @@ -32,6 +32,7 @@ #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDocumentLoader.h" #include "nsString.h" diff --git a/mozilla/extensions/p3p/src/nsP3PUI.cpp b/mozilla/extensions/p3p/src/nsP3PUI.cpp index 25eef9fa889..d78cd1546ec 100644 --- a/mozilla/extensions/p3p/src/nsP3PUI.cpp +++ b/mozilla/extensions/p3p/src/nsP3PUI.cpp @@ -28,6 +28,7 @@ #include "nsP3PLogging.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIObserverService.h" #include "nsIDocumentLoader.h" diff --git a/mozilla/extensions/wallet/src/nsWalletService.cpp b/mozilla/extensions/wallet/src/nsWalletService.cpp index cf419b05e4f..ff795dce918 100644 --- a/mozilla/extensions/wallet/src/nsWalletService.cpp +++ b/mozilla/extensions/wallet/src/nsWalletService.cpp @@ -42,6 +42,7 @@ #include "nsIDocShell.h" #include "nsIDOMWindowInternal.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIPrompt.h" #include "nsIChannel.h" #include "nsIWindowWatcher.h" diff --git a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp index 01575547040..7acb7666052 100644 --- a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp @@ -53,6 +53,7 @@ #include "nsIDocShellTreeOwner.h" #include "nsIEventQueueService.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #endif #include "nsIDOMClassInfo.h" #include "nsIDOMElement.h" diff --git a/mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp b/mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp index cfd75c14d00..8988c7a8cce 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp @@ -27,6 +27,7 @@ #include "nsCOMPtr.h" #include "nsString.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIContentViewer.h" #include "nsIDocumentViewer.h" diff --git a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp index f9487065345..2e9aec41889 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp @@ -63,6 +63,7 @@ #include "nsIWebNavigation.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIWebProgress.h" //////////////////////////////////////////////////////////////////////// diff --git a/mozilla/gfx/src/nsRenderingContextImpl.cpp b/mozilla/gfx/src/nsRenderingContextImpl.cpp index 75a7b66ba09..4fb10a72bcf 100644 --- a/mozilla/gfx/src/nsRenderingContextImpl.cpp +++ b/mozilla/gfx/src/nsRenderingContextImpl.cpp @@ -689,6 +689,7 @@ float avx,avy,av1x,av1y; #include "imgIContainer.h" #include "gfxIImageFrame.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" /* [noscript] void drawImage (in imgIContainer aImage, [const] in nsRect aSrcRect, [const] in nsPoint aDestPoint); */ NS_IMETHODIMP nsRenderingContextImpl::DrawImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsPoint * aDestPoint) diff --git a/mozilla/gfx/src/ps/nsRenderingContextPS.cpp b/mozilla/gfx/src/ps/nsRenderingContextPS.cpp index 7423e2f6d3c..4db2aae90e7 100644 --- a/mozilla/gfx/src/ps/nsRenderingContextPS.cpp +++ b/mozilla/gfx/src/ps/nsRenderingContextPS.cpp @@ -1271,6 +1271,7 @@ nsRenderingContextPS::DrawTile(nsIImage *aImage,nscoord aX0,nscoord aY0,nscoord #include "imgIContainer.h" #include "gfxIImageFrame.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" /* [noscript] void drawImage (in imgIContainer aImage, [const] in nsRect aSrcRect, [const] in nsPoint aDestPoint); */ NS_IMETHODIMP nsRenderingContextPS::DrawImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsPoint * aDestPoint) diff --git a/mozilla/gfx/src/shared/gfxImageFrame.h b/mozilla/gfx/src/shared/gfxImageFrame.h index 2351942d8b0..79d62ffa5ab 100644 --- a/mozilla/gfx/src/shared/gfxImageFrame.h +++ b/mozilla/gfx/src/shared/gfxImageFrame.h @@ -23,6 +23,7 @@ #include "gfxIImageFrame.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIImage.h" diff --git a/mozilla/gfx/src/shared/nsRenderingContextImpl.cpp b/mozilla/gfx/src/shared/nsRenderingContextImpl.cpp index 75a7b66ba09..4fb10a72bcf 100644 --- a/mozilla/gfx/src/shared/nsRenderingContextImpl.cpp +++ b/mozilla/gfx/src/shared/nsRenderingContextImpl.cpp @@ -689,6 +689,7 @@ float avx,avy,av1x,av1y; #include "imgIContainer.h" #include "gfxIImageFrame.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" /* [noscript] void drawImage (in imgIContainer aImage, [const] in nsRect aSrcRect, [const] in nsPoint aDestPoint); */ NS_IMETHODIMP nsRenderingContextImpl::DrawImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsPoint * aDestPoint) diff --git a/mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp b/mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp index 64237256bd1..2e68035644d 100644 --- a/mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp +++ b/mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp @@ -39,6 +39,7 @@ #include "imgIContainer.h" #include "gfxIImageFrame.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #endif /* _IMPL_NS_XPRINT */ #ifdef _IMPL_NS_XPRINT diff --git a/mozilla/gfx/src/xprint/nsRenderingContextXP.cpp b/mozilla/gfx/src/xprint/nsRenderingContextXP.cpp index 4cbfebe61aa..cb41a6150a5 100644 --- a/mozilla/gfx/src/xprint/nsRenderingContextXP.cpp +++ b/mozilla/gfx/src/xprint/nsRenderingContextXP.cpp @@ -1465,6 +1465,7 @@ nsRenderingContextXp::DrawImage(nsIImage *aImage, const nsRect& aSRect, const ns #include "imgIContainer.h" #include "gfxIImageFrame.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" /* [noscript] void drawImage (in imgIContainer aImage, [const] in nsRect aSrcRect, [const] in nsPoint aDestPoint); */ NS_IMETHODIMP nsRenderingContextXp::DrawImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsPoint * aDestPoint) diff --git a/mozilla/gfx2/src/gfxImageFrame.h b/mozilla/gfx2/src/gfxImageFrame.h index 2351942d8b0..79d62ffa5ab 100644 --- a/mozilla/gfx2/src/gfxImageFrame.h +++ b/mozilla/gfx2/src/gfxImageFrame.h @@ -23,6 +23,7 @@ #include "gfxIImageFrame.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIImage.h" diff --git a/mozilla/htmlparser/robot/nsDebugRobot.cpp b/mozilla/htmlparser/robot/nsDebugRobot.cpp index 0ce18b941ae..ad261d29cc0 100644 --- a/mozilla/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/htmlparser/robot/nsDebugRobot.cpp @@ -38,6 +38,7 @@ #include "nsIComponentManager.h" #include "nsParserCIID.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index 8f0d559cabb..c39a9a8bb9f 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -71,6 +71,7 @@ #include "nsIContentViewerFile.h" #include "nsIMarkupDocumentViewer.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeNode.h" #include "nsIDocShellTreeOwner.h" diff --git a/mozilla/layout/base/nsPresContext.cpp b/mozilla/layout/base/nsPresContext.cpp index a06a2f7ec37..ba286312bf3 100644 --- a/mozilla/layout/base/nsPresContext.cpp +++ b/mozilla/layout/base/nsPresContext.cpp @@ -41,6 +41,7 @@ #include "nsIComponentManager.h" #include "nsIURIContentListener.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIServiceManager.h" #include "nsBoxLayoutState.h" #include "nsIBox.h" diff --git a/mozilla/layout/base/src/nsPresContext.cpp b/mozilla/layout/base/src/nsPresContext.cpp index a06a2f7ec37..ba286312bf3 100644 --- a/mozilla/layout/base/src/nsPresContext.cpp +++ b/mozilla/layout/base/src/nsPresContext.cpp @@ -41,6 +41,7 @@ #include "nsIComponentManager.h" #include "nsIURIContentListener.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIServiceManager.h" #include "nsBoxLayoutState.h" #include "nsIBox.h" diff --git a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp index e471dc5f90f..5a6d727c22f 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp @@ -43,6 +43,7 @@ #include "nsIDocShellTreeOwner.h" #include "nsIWebBrowserChrome.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDOMElement.h" #include "nsIDOMEventReceiver.h" diff --git a/mozilla/mailnews/absync/src/nsAbSync.cpp b/mozilla/mailnews/absync/src/nsAbSync.cpp index 86f9efd6456..0ff7ae1c3c9 100644 --- a/mozilla/mailnews/absync/src/nsAbSync.cpp +++ b/mozilla/mailnews/absync/src/nsAbSync.cpp @@ -43,6 +43,7 @@ #include "nsMsgI18N.h" #include "nsIScriptGlobalObject.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeNode.h" #include "nsIPrompt.h" diff --git a/mozilla/mailnews/absync/src/nsAbSyncPostEngine.h b/mozilla/mailnews/absync/src/nsAbSyncPostEngine.h index 0aa9689db82..7a9d89fb260 100644 --- a/mozilla/mailnews/absync/src/nsAbSyncPostEngine.h +++ b/mozilla/mailnews/absync/src/nsAbSyncPostEngine.h @@ -28,6 +28,7 @@ #include "nsFileStream.h" #include "nsIAbSyncPostEngine.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsCURILoader.h" #include "nsIURIContentListener.h" #include "nsIURI.h" diff --git a/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp b/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp index a05b6923686..b6871430ca8 100644 --- a/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp +++ b/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp @@ -36,6 +36,7 @@ #include "nsMsgUtils.h" #include "nsIWebProgress.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIMarkupDocumentViewer.h" #include "nsIMsgMailSession.h" #include "nsMsgPrintEngine.h" diff --git a/mozilla/mailnews/base/src/nsMsgWindow.cpp b/mozilla/mailnews/base/src/nsMsgWindow.cpp index 2e5d3bcfd29..321f8aacd37 100644 --- a/mozilla/mailnews/base/src/nsMsgWindow.cpp +++ b/mozilla/mailnews/base/src/nsMsgWindow.cpp @@ -35,6 +35,7 @@ #include "nsILoadGroup.h" #include "nsIMsgMailNewsUrl.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIWebProgress.h" #include "nsIWebProgressListener.h" #include "nsPIDOMWindow.h" diff --git a/mozilla/mailnews/base/util/nsMsgDBFolder.cpp b/mozilla/mailnews/base/util/nsMsgDBFolder.cpp index 5a3ef88ca1f..d3fd33f0745 100644 --- a/mozilla/mailnews/base/util/nsMsgDBFolder.cpp +++ b/mozilla/mailnews/base/util/nsMsgDBFolder.cpp @@ -43,6 +43,7 @@ #include "nsIMsgWindow.h" #include "nsIPrompt.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIStringBundle.h" diff --git a/mozilla/mailnews/base/util/nsMsgFolder.cpp b/mozilla/mailnews/base/util/nsMsgFolder.cpp index 3f7e0bcaefd..8b3f30cea6b 100644 --- a/mozilla/mailnews/base/util/nsMsgFolder.cpp +++ b/mozilla/mailnews/base/util/nsMsgFolder.cpp @@ -57,6 +57,7 @@ #include "nsIMsgWindow.h" #include "nsIPrompt.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIStringBundle.h" #include "nsTextFormatter.h" diff --git a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp index 61801b63989..7f6a91783c2 100644 --- a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp +++ b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp @@ -54,6 +54,7 @@ #include "nsIRDFService.h" #include "nsRDFCID.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #ifdef DEBUG_sspitzer #define DEBUG_MSGINCOMING_SERVER diff --git a/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp b/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp index 07442670dba..fc0cb8df790 100644 --- a/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp +++ b/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp @@ -33,6 +33,7 @@ #include "nsIWebProgress.h" #include "nsIWebProgressListener.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIIOService.h" #include "nsNetCID.h" diff --git a/mozilla/mailnews/base/util/nsMsgProtocol.h b/mozilla/mailnews/base/util/nsMsgProtocol.h index f6293e8518e..0659eb60f00 100644 --- a/mozilla/mailnews/base/util/nsMsgProtocol.h +++ b/mozilla/mailnews/base/util/nsMsgProtocol.h @@ -32,6 +32,7 @@ #include "nsCOMPtr.h" #include "nsIFileSpec.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIStreamProvider.h" #include "nsIProgressEventSink.h" #include "nsITransport.h" diff --git a/mozilla/mailnews/compose/src/nsMsgSend.cpp b/mozilla/mailnews/compose/src/nsMsgSend.cpp index 3853c662157..67d6a2ab826 100644 --- a/mozilla/mailnews/compose/src/nsMsgSend.cpp +++ b/mozilla/mailnews/compose/src/nsMsgSend.cpp @@ -73,6 +73,7 @@ #include "nsMimeTypes.h" #include "nsISmtpUrl.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDocumentEncoder.h" // for editor output flags #include "nsILoadGroup.h" #include "nsMsgSendReport.h" diff --git a/mozilla/mailnews/compose/src/nsSmtpUrl.h b/mozilla/mailnews/compose/src/nsSmtpUrl.h index c29d7c9eb35..13e227a8da2 100644 --- a/mozilla/mailnews/compose/src/nsSmtpUrl.h +++ b/mozilla/mailnews/compose/src/nsSmtpUrl.h @@ -33,6 +33,7 @@ #include "nsIAuthPrompt.h" #include "nsISmtpServer.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" class nsMailtoUrl : public nsIMailtoUrl, public nsIURI { diff --git a/mozilla/mailnews/compose/src/nsURLFetcher.h b/mozilla/mailnews/compose/src/nsURLFetcher.h index 61beef9e88a..bc70deca356 100644 --- a/mozilla/mailnews/compose/src/nsURLFetcher.h +++ b/mozilla/mailnews/compose/src/nsURLFetcher.h @@ -29,6 +29,7 @@ #include "nsIStreamListener.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsCURILoader.h" #include "nsIURIContentListener.h" #include "nsIWebProgressListener.h" diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp index 2ad7350d73b..14bbd1de295 100644 --- a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp +++ b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp @@ -59,6 +59,7 @@ #include "nsIPrompt.h" #include "nsIDocShell.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsSpecialSystemDirectory.h" #include "nsXPIDLString.h" #include "nsIImapFlagAndUidState.h" diff --git a/mozilla/mailnews/imap/src/nsImapProtocol.h b/mozilla/mailnews/imap/src/nsImapProtocol.h index 1f0214bbaad..89509b9eebc 100644 --- a/mozilla/mailnews/imap/src/nsImapProtocol.h +++ b/mozilla/mailnews/imap/src/nsImapProtocol.h @@ -35,6 +35,7 @@ #include "nsString.h" #include "nsIProgressEventSink.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsITransport.h" // imap event sinks diff --git a/mozilla/mailnews/imap/src/nsImapUrl.cpp b/mozilla/mailnews/imap/src/nsImapUrl.cpp index ae1196b80ba..ddc1a7c3e7b 100644 --- a/mozilla/mailnews/imap/src/nsImapUrl.cpp +++ b/mozilla/mailnews/imap/src/nsImapUrl.cpp @@ -49,6 +49,7 @@ #include "nsIMsgFolder.h" #include "nsIDocShell.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsMsgUtils.h" #include "nsIMsgHdr.h" #include "nsIProgressEventSink.h" diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp index 1a5999b0bb3..b72dbf3c891 100644 --- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp +++ b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp @@ -79,6 +79,7 @@ #include "nsIDocShell.h" #include "nsIPrompt.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIPop3URL.h" #include "nsIMsgMailSession.h" #include "nsIMsgFolderCompactor.h" diff --git a/mozilla/mailnews/mime/emitters/src/nsMimeBaseEmitter.h b/mozilla/mailnews/mime/emitters/src/nsMimeBaseEmitter.h index d91444d7b1a..2212687d872 100644 --- a/mozilla/mailnews/mime/emitters/src/nsMimeBaseEmitter.h +++ b/mozilla/mailnews/mime/emitters/src/nsMimeBaseEmitter.h @@ -42,6 +42,7 @@ #include "nsVoidArray.h" #include "nsIMimeConverter.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" // // The base emitter will serve as the place to do all of the caching, diff --git a/mozilla/mailnews/mime/src/nsStreamConverter.cpp b/mozilla/mailnews/mime/src/nsStreamConverter.cpp index a7c8c8b1c30..bcee9e02603 100644 --- a/mozilla/mailnews/mime/src/nsStreamConverter.cpp +++ b/mozilla/mailnews/mime/src/nsStreamConverter.cpp @@ -52,6 +52,7 @@ #include "nsStreamConverter.h" #include "nsICategoryManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #define PREF_MAIL_DISPLAY_GLYPH "mail.display_glyph" #define PREF_MAIL_DISPLAY_STRUCT "mail.display_struct" diff --git a/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp b/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp index a35495a1588..0ee9f84b447 100644 --- a/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp +++ b/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp @@ -73,6 +73,7 @@ #include "nsISupportsPrimitives.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIMsgWindow.h" #include "nsIDocShell.h" diff --git a/mozilla/mailnews/news/src/nsNewsFolder.cpp b/mozilla/mailnews/news/src/nsNewsFolder.cpp index 53ffc6e6fdd..c3a56f56f56 100644 --- a/mozilla/mailnews/news/src/nsNewsFolder.cpp +++ b/mozilla/mailnews/news/src/nsNewsFolder.cpp @@ -71,6 +71,7 @@ #include "nsNewsSummarySpec.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsReadableUtils.h" #include "nsNewsDownloader.h" diff --git a/mozilla/modules/libjar/nsJARChannel.h b/mozilla/modules/libjar/nsJARChannel.h index 41ae97dacc3..f663c23e126 100644 --- a/mozilla/modules/libjar/nsJARChannel.h +++ b/mozilla/modules/libjar/nsJARChannel.h @@ -33,6 +33,7 @@ #include "nsIChannel.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsCOMPtr.h" #include "nsIFile.h" #include "prmon.h" diff --git a/mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp b/mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp index f7d59d26b08..417d1269938 100644 --- a/mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp +++ b/mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp @@ -25,6 +25,7 @@ #include "nsIIconURI.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsXPIDLString.h" #include "nsMimeTypes.h" #include "nsMemory.h" diff --git a/mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.h b/mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.h index c3dc1e75ca2..593d2fd736f 100644 --- a/mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.h +++ b/mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.h @@ -24,6 +24,7 @@ #include "nsIChannel.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIURI.h" class nsIFile; diff --git a/mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp b/mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp index c9e88e30f54..0ed6f82b725 100644 --- a/mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp +++ b/mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp @@ -25,6 +25,7 @@ #include "nsIIconURI.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsXPIDLString.h" #include "nsMimeTypes.h" #include "nsMemory.h" diff --git a/mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.h b/mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.h index 5ec96937651..4c129bc9d7c 100644 --- a/mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.h +++ b/mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.h @@ -28,6 +28,7 @@ #include "nsIChannel.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIURI.h" class nsIFile; diff --git a/mozilla/modules/libpr0n/decoders/mng/imgContainerMNG.cpp b/mozilla/modules/libpr0n/decoders/mng/imgContainerMNG.cpp index 22bc0cf6ea8..8640694dd08 100644 --- a/mozilla/modules/libpr0n/decoders/mng/imgContainerMNG.cpp +++ b/mozilla/modules/libpr0n/decoders/mng/imgContainerMNG.cpp @@ -22,6 +22,7 @@ #include "imgContainerMNG.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "gfxIImageFrame.h" #include "nsIImage.h" #include "nsIInputStream.h" diff --git a/mozilla/modules/libpr0n/src/imgContainer.cpp b/mozilla/modules/libpr0n/src/imgContainer.cpp index 9f4c1a5e7a1..34b6ce56aa2 100644 --- a/mozilla/modules/libpr0n/src/imgContainer.cpp +++ b/mozilla/modules/libpr0n/src/imgContainer.cpp @@ -27,6 +27,7 @@ #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "gfxIImageFrame.h" #include "nsIImage.h" #include "nsMemory.h" diff --git a/mozilla/modules/oji/src/nsJVMManager.cpp b/mozilla/modules/oji/src/nsJVMManager.cpp index 69344240455..a3a389060c1 100644 --- a/mozilla/modules/oji/src/nsJVMManager.cpp +++ b/mozilla/modules/oji/src/nsJVMManager.cpp @@ -59,6 +59,7 @@ #include "nsIDocShellTreeOwner.h" #include "nsIWebBrowserChrome.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIStringBundle.h" diff --git a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp index 84cf0b1ca8e..698df3301ba 100644 --- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp @@ -40,6 +40,7 @@ #include "nsIContent.h" #include "nsIDocument.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeOwner.h" #include "nsIWebBrowserChrome.h" diff --git a/mozilla/netwerk/base/public/nsNetUtil.h b/mozilla/netwerk/base/public/nsNetUtil.h index 343f1f2327c..7bf806f3965 100644 --- a/mozilla/netwerk/base/public/nsNetUtil.h +++ b/mozilla/netwerk/base/public/nsNetUtil.h @@ -32,6 +32,7 @@ #include "nsIRequestObserverProxy.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsString.h" #include "nsReadableUtils.h" #include "nsIIOService.h" diff --git a/mozilla/netwerk/base/src/nsFileTransport.cpp b/mozilla/netwerk/base/src/nsFileTransport.cpp index 33bd8c993e2..ba9b39360f9 100644 --- a/mozilla/netwerk/base/src/nsFileTransport.cpp +++ b/mozilla/netwerk/base/src/nsFileTransport.cpp @@ -26,6 +26,7 @@ #include "nsFileTransport.h" #include "nsFileTransportService.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsAutoLock.h" #include "netCore.h" #include "nsIFileStreams.h" diff --git a/mozilla/netwerk/base/src/nsFileTransport.h b/mozilla/netwerk/base/src/nsFileTransport.h index 16d07d91fb4..8b8c4eccd5c 100644 --- a/mozilla/netwerk/base/src/nsFileTransport.h +++ b/mozilla/netwerk/base/src/nsFileTransport.h @@ -40,6 +40,7 @@ #include "nsIOutputStream.h" #include "nsIStreamIO.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIFile.h" #include "prlog.h" #include "nsFileTransportService.h" diff --git a/mozilla/netwerk/base/src/nsInputStreamChannel.h b/mozilla/netwerk/base/src/nsInputStreamChannel.h index 8caea9b57ef..b4a972e9b19 100644 --- a/mozilla/netwerk/base/src/nsInputStreamChannel.h +++ b/mozilla/netwerk/base/src/nsInputStreamChannel.h @@ -31,6 +31,7 @@ #include "nsIStreamListener.h" #include "nsIStreamProvider.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #include "nsIStreamIO.h" #include "nsITransport.h" diff --git a/mozilla/netwerk/base/src/nsLoadGroup.h b/mozilla/netwerk/base/src/nsLoadGroup.h index 6dee7cf6b1c..f44f465b839 100644 --- a/mozilla/netwerk/base/src/nsLoadGroup.h +++ b/mozilla/netwerk/base/src/nsLoadGroup.h @@ -31,6 +31,7 @@ #include "nsWeakPtr.h" #include "nsWeakReference.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" class nsISupportsArray; diff --git a/mozilla/netwerk/base/src/nsSocketTransport.cpp b/mozilla/netwerk/base/src/nsSocketTransport.cpp index fb25addd6e3..190a1e386ef 100644 --- a/mozilla/netwerk/base/src/nsSocketTransport.cpp +++ b/mozilla/netwerk/base/src/nsSocketTransport.cpp @@ -37,6 +37,7 @@ #include "nsISocketProviderService.h" #include "nsStdURL.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProxyObjectManager.h" #include "nsXPIDLString.h" #include "nsNetUtil.h" diff --git a/mozilla/netwerk/base/src/nsSocketTransport.h b/mozilla/netwerk/base/src/nsSocketTransport.h index 4899c62714b..53d0a85199f 100644 --- a/mozilla/netwerk/base/src/nsSocketTransport.h +++ b/mozilla/netwerk/base/src/nsSocketTransport.h @@ -39,6 +39,7 @@ #include "nsIPipe.h" #include "nsIProgressEventSink.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIFileStreams.h" #define NS_SOCKET_TRANSPORT_SEGMENT_SIZE (2*1024) diff --git a/mozilla/netwerk/base/src/nsStorageTransport.h b/mozilla/netwerk/base/src/nsStorageTransport.h index 286157c9398..fa28fa467f5 100644 --- a/mozilla/netwerk/base/src/nsStorageTransport.h +++ b/mozilla/netwerk/base/src/nsStorageTransport.h @@ -32,6 +32,7 @@ #include "nsCOMPtr.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" /** diff --git a/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.h b/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.h index 39a5d1c29c0..7c34b5201b4 100644 --- a/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.h +++ b/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.h @@ -30,6 +30,7 @@ #include "nsIOutputStream.h" #include "nsITransport.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" /****************************************************************************** * nsCacheEntryDescriptor diff --git a/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp b/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp index 77810830335..d63a471682e 100644 --- a/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp +++ b/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp @@ -29,6 +29,7 @@ #include "nsILoadGroup.h" #include "plbase64.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIPipe.h" #include "nsIInputStream.h" #include "nsIOutputStream.h" diff --git a/mozilla/netwerk/protocol/data/src/nsDataChannel.h b/mozilla/netwerk/protocol/data/src/nsDataChannel.h index f2b3e3c2319..139e1c7f94b 100644 --- a/mozilla/netwerk/protocol/data/src/nsDataChannel.h +++ b/mozilla/netwerk/protocol/data/src/nsDataChannel.h @@ -33,6 +33,7 @@ #include "nsIStreamListener.h" #include "nsIInputStream.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsCOMPtr.h" class nsDataChannel : public nsIDataChannel { diff --git a/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp b/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp index 19deb67a0b9..db7ba4361ee 100644 --- a/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp +++ b/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp @@ -28,6 +28,7 @@ #include "nsIComponentManager.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #include "nsNetCID.h" diff --git a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp index caa75b8e617..c99ff7c547e 100644 --- a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp +++ b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp @@ -27,6 +27,7 @@ #include "nsIServiceManager.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsXPIDLString.h" #include "nsISocketTransportService.h" #include "nsITransport.h" diff --git a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.h b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.h index 1caf8c24de9..b7118239f65 100644 --- a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.h +++ b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.h @@ -31,6 +31,7 @@ #include "nsILoadGroup.h" #include "nsIInputStream.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsCOMPtr.h" #include "nsXPIDLString.h" #include "nsIChannel.h" diff --git a/mozilla/netwerk/protocol/datetime/src/nsDateTimeHandler.cpp b/mozilla/netwerk/protocol/datetime/src/nsDateTimeHandler.cpp index 0e609fc3223..1a1ebf48cf0 100644 --- a/mozilla/netwerk/protocol/datetime/src/nsDateTimeHandler.cpp +++ b/mozilla/netwerk/protocol/datetime/src/nsDateTimeHandler.cpp @@ -28,6 +28,7 @@ #include "nsIComponentManager.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #include "nsNetCID.h" diff --git a/mozilla/netwerk/protocol/file/src/nsFileChannel.h b/mozilla/netwerk/protocol/file/src/nsFileChannel.h index b362ca3a598..40c66f40cba 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileChannel.h +++ b/mozilla/netwerk/protocol/file/src/nsFileChannel.h @@ -25,6 +25,7 @@ #include "nsIChannel.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsILoadGroup.h" #include "nsIStreamListener.h" #include "nsFileSpec.h" diff --git a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp index 79cd211a5f9..03a6018102e 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp @@ -28,6 +28,7 @@ #include "nsIComponentManager.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #include "nsIThread.h" #include "nsIThreadPool.h" diff --git a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp index d9fe1684832..7e6898a56b9 100644 --- a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp +++ b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp @@ -26,6 +26,7 @@ #include "nsIServiceManager.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsXPIDLString.h" #include "nsISocketTransportService.h" #include "nsIStringStream.h" diff --git a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.h b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.h index ff8b7bccebd..9086ec00aa1 100644 --- a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.h +++ b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.h @@ -27,6 +27,7 @@ #include "nsILoadGroup.h" #include "nsIInputStream.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsCOMPtr.h" #include "nsXPIDLString.h" #include "nsIChannel.h" diff --git a/mozilla/netwerk/protocol/finger/src/nsFingerHandler.cpp b/mozilla/netwerk/protocol/finger/src/nsFingerHandler.cpp index 5ed8c49d4e4..3a61fd1fe1c 100644 --- a/mozilla/netwerk/protocol/finger/src/nsFingerHandler.cpp +++ b/mozilla/netwerk/protocol/finger/src/nsFingerHandler.cpp @@ -28,6 +28,7 @@ #include "nsIComponentManager.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #include "nsNetCID.h" diff --git a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h index 2408b243b63..79c83499e2a 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h +++ b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.h @@ -33,6 +33,7 @@ #include "nsIProtocolHandler.h" #include "nsIProgressEventSink.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIThreadPool.h" #include "nsFtpConnectionThread.h" #include "netCore.h" diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp index 626be84196f..63927f97daf 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp @@ -36,6 +36,7 @@ #include "nsProxiedService.h" #include "nsCRT.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIURL.h" #include "nsEscape.h" #include "nsNetUtil.h" diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp index 4f02e02bacb..d451e08f739 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp @@ -40,6 +40,7 @@ #include "nsCRT.h" #include "nsIComponentManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #include "prlog.h" #include "nsIPref.h" diff --git a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp index d796cee5671..df4eb99a883 100644 --- a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp +++ b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp @@ -27,6 +27,7 @@ #include "nsIServiceManager.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsXPIDLString.h" #include "nsISocketTransportService.h" #include "nsIStringStream.h" diff --git a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.h b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.h index f65f8ecc80a..766762c9e9b 100644 --- a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.h +++ b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.h @@ -27,6 +27,7 @@ #include "nsILoadGroup.h" #include "nsIInputStream.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsCOMPtr.h" #include "nsXPIDLString.h" #include "nsIChannel.h" diff --git a/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp b/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp index d0be7643745..06f413c1d00 100644 --- a/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp +++ b/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp @@ -32,6 +32,7 @@ #include "nsIComponentManager.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" //#include "nsIHTTPProtocolHandler.h" //#include "nsIHTTPChannel.h" diff --git a/mozilla/netwerk/protocol/http/src/nsHttpChannel.h b/mozilla/netwerk/protocol/http/src/nsHttpChannel.h index c540e21685d..03c8c4b454b 100644 --- a/mozilla/netwerk/protocol/http/src/nsHttpChannel.h +++ b/mozilla/netwerk/protocol/http/src/nsHttpChannel.h @@ -32,6 +32,7 @@ #include "nsIURI.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIInputStream.h" #include "nsIProgressEventSink.h" #include "nsICachingChannel.h" diff --git a/mozilla/netwerk/protocol/http/src/nsHttpConnection.h b/mozilla/netwerk/protocol/http/src/nsHttpConnection.h index 7a4dc3e6b97..05593eaa34e 100644 --- a/mozilla/netwerk/protocol/http/src/nsHttpConnection.h +++ b/mozilla/netwerk/protocol/http/src/nsHttpConnection.h @@ -30,6 +30,7 @@ #include "nsISocketTransport.h" #include "nsIProgressEventSink.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIEventQueue.h" #include "nsIInputStream.h" #include "nsCOMPtr.h" diff --git a/mozilla/netwerk/protocol/http/src/nsHttpTransaction.h b/mozilla/netwerk/protocol/http/src/nsHttpTransaction.h index 8f49021e92d..552b2c76cc0 100644 --- a/mozilla/netwerk/protocol/http/src/nsHttpTransaction.h +++ b/mozilla/netwerk/protocol/http/src/nsHttpTransaction.h @@ -29,6 +29,7 @@ #include "nsIStreamListener.h" #include "nsIInputStream.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIEventQueue.h" #include "nsXPIDLString.h" #include "nsCOMPtr.h" diff --git a/mozilla/netwerk/protocol/jar/src/nsJARChannel.h b/mozilla/netwerk/protocol/jar/src/nsJARChannel.h index 41ae97dacc3..f663c23e126 100644 --- a/mozilla/netwerk/protocol/jar/src/nsJARChannel.h +++ b/mozilla/netwerk/protocol/jar/src/nsJARChannel.h @@ -33,6 +33,7 @@ #include "nsIChannel.h" #include "nsILoadGroup.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsCOMPtr.h" #include "nsIFile.h" #include "prmon.h" diff --git a/mozilla/netwerk/protocol/res/src/nsResChannel.h b/mozilla/netwerk/protocol/res/src/nsResChannel.h index 49f24d89b29..562c1c5bad2 100644 --- a/mozilla/netwerk/protocol/res/src/nsResChannel.h +++ b/mozilla/netwerk/protocol/res/src/nsResChannel.h @@ -30,6 +30,7 @@ #include "nsIResProtocolHandler.h" #include "nsIURI.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsILoadGroup.h" #include "nsIInputStream.h" #include "nsISupportsArray.h" diff --git a/mozilla/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp b/mozilla/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp index 1b86a244363..647efa29094 100644 --- a/mozilla/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp +++ b/mozilla/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp @@ -25,6 +25,7 @@ #include "nsIIOService.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsXPIDLString.h" #include "nsMimeTypes.h" #include "nsNetUtil.h" diff --git a/mozilla/netwerk/test/TestCallbacks.cpp b/mozilla/netwerk/test/TestCallbacks.cpp index 253bd548f0b..9da7fac5e19 100644 --- a/mozilla/netwerk/test/TestCallbacks.cpp +++ b/mozilla/netwerk/test/TestCallbacks.cpp @@ -36,6 +36,7 @@ #include "nsIChannel.h" #include "nsIURL.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDNSService.h" #include "nsISimpleEnumerator.h" diff --git a/mozilla/netwerk/test/TestFileTransport.cpp b/mozilla/netwerk/test/TestFileTransport.cpp index 84208404f41..5492a38227c 100644 --- a/mozilla/netwerk/test/TestFileTransport.cpp +++ b/mozilla/netwerk/test/TestFileTransport.cpp @@ -24,6 +24,7 @@ #include "nsITransport.h" #include "nsIProgressEventSink.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIRequest.h" #include "nsIServiceManager.h" #include "nsIComponentManager.h" diff --git a/mozilla/netwerk/test/TestHttp.cpp b/mozilla/netwerk/test/TestHttp.cpp index b04b8e1bb4e..0cfa67d05a6 100644 --- a/mozilla/netwerk/test/TestHttp.cpp +++ b/mozilla/netwerk/test/TestHttp.cpp @@ -2,6 +2,7 @@ #include "nsIEventQueueService.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #define RETURN_IF_FAILED(rv, step) \ diff --git a/mozilla/netwerk/test/TestPageLoad.cpp b/mozilla/netwerk/test/TestPageLoad.cpp index 62a9b7e6986..c070c7f68e6 100644 --- a/mozilla/netwerk/test/TestPageLoad.cpp +++ b/mozilla/netwerk/test/TestPageLoad.cpp @@ -25,6 +25,7 @@ #include "nsIEventQueueService.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #include "nsIComponentManager.h" #include "prprf.h" diff --git a/mozilla/netwerk/test/TestProtocols.cpp b/mozilla/netwerk/test/TestProtocols.cpp index c7700135b5a..79e9d5537d1 100644 --- a/mozilla/netwerk/test/TestProtocols.cpp +++ b/mozilla/netwerk/test/TestProtocols.cpp @@ -47,6 +47,7 @@ #include "nsIHttpChannel.h" #include "nsIHttpEventSink.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDNSService.h" #include "nsISimpleEnumerator.h" diff --git a/mozilla/netwerk/test/TestSocketTransport.cpp b/mozilla/netwerk/test/TestSocketTransport.cpp index c5e8e664236..4d4ba2243a5 100644 --- a/mozilla/netwerk/test/TestSocketTransport.cpp +++ b/mozilla/netwerk/test/TestSocketTransport.cpp @@ -48,6 +48,7 @@ #include "nsIThread.h" #include "nsITimer.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #include "nsCRT.h" #include "nsNetUtil.h" diff --git a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp index 0ce18b941ae..ad261d29cc0 100644 --- a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp @@ -38,6 +38,7 @@ #include "nsIComponentManager.h" #include "nsParserCIID.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); diff --git a/mozilla/profile/src/nsProfile.h b/mozilla/profile/src/nsProfile.h index f35ba9941e7..f98f2ef8b2b 100644 --- a/mozilla/profile/src/nsProfile.h +++ b/mozilla/profile/src/nsProfile.h @@ -35,6 +35,7 @@ // Interfaces Needed #include "nsIXULWindow.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIURIContentListener.h" #include "nsIDirectoryService.h" diff --git a/mozilla/uriloader/base/nsDocLoader.h b/mozilla/uriloader/base/nsDocLoader.h index 749b477184d..1251f3bf493 100644 --- a/mozilla/uriloader/base/nsDocLoader.h +++ b/mozilla/uriloader/base/nsDocLoader.h @@ -38,6 +38,7 @@ #include "nsIChannel.h" #include "nsIProgressEventSink.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIHttpEventSink.h" #include "nsISecurityEventSink.h" #include "nsCOMPtr.h" diff --git a/mozilla/uriloader/base/nsURILoader.cpp b/mozilla/uriloader/base/nsURILoader.cpp index 2534aca32a2..55c5a4b4527 100644 --- a/mozilla/uriloader/base/nsURILoader.cpp +++ b/mozilla/uriloader/base/nsURILoader.cpp @@ -33,6 +33,7 @@ #include "nsIURI.h" #include "nsIChannel.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #include "nsIInputStream.h" #include "nsIStreamConverterService.h" diff --git a/mozilla/uriloader/base/nsURILoader.h b/mozilla/uriloader/base/nsURILoader.h index b87b04f63b7..0a59d318feb 100644 --- a/mozilla/uriloader/base/nsURILoader.h +++ b/mozilla/uriloader/base/nsURILoader.h @@ -28,6 +28,7 @@ #include "nsISupportsArray.h" #include "nsCOMPtr.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsString.h" class nsURILoader : public nsIURILoader diff --git a/mozilla/uriloader/exthandler/nsExternalHelperAppService.h b/mozilla/uriloader/exthandler/nsExternalHelperAppService.h index c04aa9e8cb3..6765c59960e 100644 --- a/mozilla/uriloader/exthandler/nsExternalHelperAppService.h +++ b/mozilla/uriloader/exthandler/nsExternalHelperAppService.h @@ -37,6 +37,7 @@ #include "nsIOutputStream.h" #include "nsString.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsILocalFile.h" #include "nsIRDFDataSource.h" diff --git a/mozilla/webshell/tests/viewer/nsViewerApp.cpp b/mozilla/webshell/tests/viewer/nsViewerApp.cpp index 79ac6edb6b4..e00fdd4666d 100644 --- a/mozilla/webshell/tests/viewer/nsViewerApp.cpp +++ b/mozilla/webshell/tests/viewer/nsViewerApp.cpp @@ -41,6 +41,7 @@ #include "nsIServiceManager.h" #include "nsIEventQueueService.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsWebCrawler.h" #include "nsSpecialSystemDirectory.h" // For exe dir #include "prprf.h" diff --git a/mozilla/webshell/tests/viewer/nsWebBrowserChrome.h b/mozilla/webshell/tests/viewer/nsWebBrowserChrome.h index 5af850f2c51..c11b205b9be 100644 --- a/mozilla/webshell/tests/viewer/nsWebBrowserChrome.h +++ b/mozilla/webshell/tests/viewer/nsWebBrowserChrome.h @@ -33,6 +33,7 @@ #include "nsIDocShellTreeOwner.h" #include "nsIEmbeddingSiteWindow.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIWebProgressListener.h" #include "nsTimer.h" #include "nsWeakReference.h" diff --git a/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp b/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp index 4ed102912ec..bf29f38ab02 100644 --- a/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp +++ b/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp @@ -28,6 +28,7 @@ #include "nsIDocShell.h" #include "nsProxiedService.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIScriptGlobalObject.h" #include "nsISupportsPrimitives.h" #include "nsIWindowMediator.h" diff --git a/mozilla/xpcom/base/MANIFEST b/mozilla/xpcom/base/MANIFEST index bc61c9c4297..f441d42f4ef 100644 --- a/mozilla/xpcom/base/MANIFEST +++ b/mozilla/xpcom/base/MANIFEST @@ -16,3 +16,4 @@ nsWeakPtr.h nscore.h nslog.h nslog.h +nsIInterfaceRequestorUtils.h diff --git a/mozilla/xpcom/base/Makefile.in b/mozilla/xpcom/base/Makefile.in index 248fad8c6fc..ba87d910f29 100644 --- a/mozilla/xpcom/base/Makefile.in +++ b/mozilla/xpcom/base/Makefile.in @@ -73,6 +73,7 @@ EXPORTS = \ nsWeakPtr.h \ nscore.h \ nslog.h \ + nsIInterfaceRequestorUtils.h \ $(NULL) ifdef NS_TRACE_MALLOC diff --git a/mozilla/xpcom/base/makefile.win b/mozilla/xpcom/base/makefile.win index d15d66ae417..6b97c8e7600 100644 --- a/mozilla/xpcom/base/makefile.win +++ b/mozilla/xpcom/base/makefile.win @@ -49,6 +49,7 @@ EXPORTS = \ !ifdef MOZ_TRACE_MALLOC nsTraceMalloc.h \ !endif + nsIInterfaceRequestorUtils.h \ $(NULL) XPIDL_MODULE = xpcom_base diff --git a/mozilla/xpcom/base/nsIInterfaceRequestor.cpp b/mozilla/xpcom/base/nsIInterfaceRequestor.cpp index de34cb768b3..35a768de109 100644 --- a/mozilla/xpcom/base/nsIInterfaceRequestor.cpp +++ b/mozilla/xpcom/base/nsIInterfaceRequestor.cpp @@ -22,6 +22,7 @@ */ #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" nsresult nsGetInterface::operator()( const nsIID& aIID, void** aInstancePtr ) const diff --git a/mozilla/xpcom/base/nsIInterfaceRequestor.idl b/mozilla/xpcom/base/nsIInterfaceRequestor.idl index 2ddd260b408..a1a9452d564 100644 --- a/mozilla/xpcom/base/nsIInterfaceRequestor.idl +++ b/mozilla/xpcom/base/nsIInterfaceRequestor.idl @@ -24,74 +24,32 @@ /** * The nsIInterfaceRequestor interface defines a generic interface for - * requesting objects that a given object might implement. This is very - * similar to QueryInterface found in nsISupports. The main difference being - * that objects returned from this interface are not required to provide a way - * back to the object implementing this interface. The semantics of QI() - * dictate that given an interface A that you QI() on to get to interface B, - * you must be able to QI on B to get back to A. This interface however - * allows you to obtain an interface C from A that may or most likely will not - * have the ability to get back to A. + * requesting interfaces that a given object might provide access to. + * This is very similar to QueryInterface found in nsISupports. + * The main difference is that interfaces returned from GetInterface() + * are not required to provide a way back to the object implementing this + * interface. The semantics of QI() dictate that given an interface A that + * you QI() on to get to interface B, you must be able to QI on B to get back + * to A. This interface however allows you to obtain an interface C from A + * that may or most likely will not have the ability to get back to A. + * + * @status FROZEN */ [scriptable, uuid(033A1470-8B2A-11d3-AF88-00A024FFC08C)] interface nsIInterfaceRequestor : nsISupports { - /* - Asks the object for a listener object supporting a particular interface. - This method is used to allow the listener to not adhere to the - QI rules. By providing a a getInterface call the component can have - completely different objects for each distinct type of interface. - */ + /** + * Retrieves the specified interface pointer. + * + * @param uuid The IID of the interface being requested. + * @param result [out] The interface pointer to be filled in if + * the interface is accessible. + * @return NS_OK - interface was successfully returned. + * NS_NOINTERFACE - interface not accessible. + * NS_ERROR* - method failure. + */ void getInterface(in nsIIDRef uuid, [iid_is(uuid),retval] out nsQIResult result); }; - -%{C++ - -#ifndef nsCOMPtr_h___ -#include "nsCOMPtr.h" -#endif - -// a type-safe shortcut for calling the |GetInterface()| member function -// T must inherit from nsIInterfaceRequestor, but the cast may be ambiguous. -template -inline -nsresult -CallGetInterface( T* aSource, DestinationType** aDestination ) - { - NS_PRECONDITION(aSource, "null parameter"); - NS_PRECONDITION(aDestination, "null parameter"); - - return aSource->GetInterface(NS_GET_IID(DestinationType), - NS_REINTERPRET_CAST(void**, aDestination)); - } - -class NS_EXPORT nsGetInterface : public nsCOMPtr_helper - { - public: - nsGetInterface( nsISupports* aSource, nsresult* error ) - : mSource(aSource), - mErrorPtr(error) - { - // nothing else to do here - } - - virtual nsresult operator()( const nsIID&, void** ) const; - virtual ~nsGetInterface() {}; - - private: - nsCOMPtr mSource; - nsresult* mErrorPtr; - }; - -inline -const nsGetInterface -do_GetInterface( nsISupports* aSource, nsresult* error = 0 ) - { - return nsGetInterface(aSource, error); - } - -%} - diff --git a/mozilla/xpcom/base/nsIInterfaceRequestorUtils.h b/mozilla/xpcom/base/nsIInterfaceRequestorUtils.h new file mode 100644 index 00000000000..c0775eb3458 --- /dev/null +++ b/mozilla/xpcom/base/nsIInterfaceRequestorUtils.h @@ -0,0 +1,67 @@ +/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is the Mozilla browser. + * + * The Initial Developer of the Original Code is Netscape + * Communications, Inc. Portions created by Netscape are + * Copyright (C) 1999, Mozilla. All Rights Reserved. + * + * Contributor(s): + */ + +#ifndef __nsInterfaceRequestorUtils_h +#define __nsInterfaceRequestorUtils_h + +#include "nsCOMPtr.h" + +// a type-safe shortcut for calling the |GetInterface()| member function +// T must inherit from nsIInterfaceRequestor, but the cast may be ambiguous. +template +inline +nsresult +CallGetInterface( T* aSource, DestinationType** aDestination ) + { + NS_PRECONDITION(aSource, "null parameter"); + NS_PRECONDITION(aDestination, "null parameter"); + + return aSource->GetInterface(NS_GET_IID(DestinationType), + NS_REINTERPRET_CAST(void**, aDestination)); + } + +class NS_EXPORT nsGetInterface : public nsCOMPtr_helper + { + public: + nsGetInterface( nsISupports* aSource, nsresult* error ) + : mSource(aSource), + mErrorPtr(error) + { + // nothing else to do here + } + + virtual nsresult operator()( const nsIID&, void** ) const; + virtual ~nsGetInterface() {}; + + private: + nsCOMPtr mSource; + nsresult* mErrorPtr; + }; + +inline +const nsGetInterface +do_GetInterface( nsISupports* aSource, nsresult* error = 0 ) + { + return nsGetInterface(aSource, error); + } + +#endif // __nsInterfaceRequestorUtils_h + diff --git a/mozilla/xpcom/build/dlldeps.cpp b/mozilla/xpcom/build/dlldeps.cpp index 49d2995c5ff..89625a91da6 100644 --- a/mozilla/xpcom/build/dlldeps.cpp +++ b/mozilla/xpcom/build/dlldeps.cpp @@ -62,6 +62,7 @@ #include "nsLinebreakConverter.h" #include "nsIBinaryInputStream.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIByteArrayInputStream.h" #include "nsReadableUtils.h" #include "nsStaticNameTable.h" diff --git a/mozilla/xpcom/components/nsComponentManager.h b/mozilla/xpcom/components/nsComponentManager.h index 5439d05c75d..07a438caad2 100644 --- a/mozilla/xpcom/components/nsComponentManager.h +++ b/mozilla/xpcom/components/nsComponentManager.h @@ -29,6 +29,7 @@ #include "nsIFactory.h" #include "nsRegistry.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsHashtable.h" #include "prtime.h" #include "prmon.h" diff --git a/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h b/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h new file mode 100644 index 00000000000..c0775eb3458 --- /dev/null +++ b/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h @@ -0,0 +1,67 @@ +/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is the Mozilla browser. + * + * The Initial Developer of the Original Code is Netscape + * Communications, Inc. Portions created by Netscape are + * Copyright (C) 1999, Mozilla. All Rights Reserved. + * + * Contributor(s): + */ + +#ifndef __nsInterfaceRequestorUtils_h +#define __nsInterfaceRequestorUtils_h + +#include "nsCOMPtr.h" + +// a type-safe shortcut for calling the |GetInterface()| member function +// T must inherit from nsIInterfaceRequestor, but the cast may be ambiguous. +template +inline +nsresult +CallGetInterface( T* aSource, DestinationType** aDestination ) + { + NS_PRECONDITION(aSource, "null parameter"); + NS_PRECONDITION(aDestination, "null parameter"); + + return aSource->GetInterface(NS_GET_IID(DestinationType), + NS_REINTERPRET_CAST(void**, aDestination)); + } + +class NS_EXPORT nsGetInterface : public nsCOMPtr_helper + { + public: + nsGetInterface( nsISupports* aSource, nsresult* error ) + : mSource(aSource), + mErrorPtr(error) + { + // nothing else to do here + } + + virtual nsresult operator()( const nsIID&, void** ) const; + virtual ~nsGetInterface() {}; + + private: + nsCOMPtr mSource; + nsresult* mErrorPtr; + }; + +inline +const nsGetInterface +do_GetInterface( nsISupports* aSource, nsresult* error = 0 ) + { + return nsGetInterface(aSource, error); + } + +#endif // __nsInterfaceRequestorUtils_h + diff --git a/mozilla/xpcom/tests/TestCallTemplates.cpp b/mozilla/xpcom/tests/TestCallTemplates.cpp index c66a4f80e54..45f56154775 100644 --- a/mozilla/xpcom/tests/TestCallTemplates.cpp +++ b/mozilla/xpcom/tests/TestCallTemplates.cpp @@ -33,6 +33,7 @@ #include "nsIServiceManager.h" #include "nsWeakReference.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #define NS_ITESTSERVICE_IID \ {0x127b5253, 0x37b1, 0x43c7, \ diff --git a/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp b/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp index 3f87fa8a972..55aee06aac9 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp @@ -30,6 +30,7 @@ #include "nsIDOMWindowInternal.h" #include "nsIFactory.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIXULWindow.h" #include "nsAppShellWindowEnumerator.h" diff --git a/mozilla/xpfe/appshell/src/nsChromeTreeOwner.h b/mozilla/xpfe/appshell/src/nsChromeTreeOwner.h index 1d98ac08f4f..898ebd0ae94 100644 --- a/mozilla/xpfe/appshell/src/nsChromeTreeOwner.h +++ b/mozilla/xpfe/appshell/src/nsChromeTreeOwner.h @@ -30,6 +30,7 @@ #include "nsIBaseWindow.h" #include "nsIDocShellTreeOwner.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIWebProgressListener.h" #include "nsWeakReference.h" diff --git a/mozilla/xpfe/appshell/src/nsContentTreeOwner.h b/mozilla/xpfe/appshell/src/nsContentTreeOwner.h index e81cd4d306f..90b96f1ec0b 100644 --- a/mozilla/xpfe/appshell/src/nsContentTreeOwner.h +++ b/mozilla/xpfe/appshell/src/nsContentTreeOwner.h @@ -31,6 +31,7 @@ #include "nsIBaseWindow.h" #include "nsIDocShellTreeOwner.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIWebBrowserChrome.h" class nsXULWindow; diff --git a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp index 665e6f00e4b..7304a81e8f6 100644 --- a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp +++ b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp @@ -51,6 +51,7 @@ // Interfaces Needed #include "nsIDocShell.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIXULWindow.h" static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); diff --git a/mozilla/xpfe/appshell/src/nsXULWindow.cpp b/mozilla/xpfe/appshell/src/nsXULWindow.cpp index 7fe75ce80a1..220e3b38beb 100644 --- a/mozilla/xpfe/appshell/src/nsXULWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsXULWindow.cpp @@ -43,6 +43,7 @@ #include "nsIDOMScreen.h" #include "nsIDOMXULDocument.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIIOService.h" #include "nsNetCID.h" #include "nsIJSContextStack.h" diff --git a/mozilla/xpfe/appshell/src/nsXULWindow.h b/mozilla/xpfe/appshell/src/nsXULWindow.h index 0504048bafa..4aecd88598f 100644 --- a/mozilla/xpfe/appshell/src/nsXULWindow.h +++ b/mozilla/xpfe/appshell/src/nsXULWindow.h @@ -40,6 +40,7 @@ #include "nsIDOMWindowInternal.h" #include "nsIEventQueueService.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIWidget.h" #include "nsIXULWindow.h" #include "nsIPrompt.h" diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp index 52f1426b7cb..e3ec4a665fa 100644 --- a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp +++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp @@ -46,6 +46,7 @@ #include "rdf.h" #include "nsIXULWindow.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" // These are needed to load a URL in a browser window. #include "nsIDOMLocation.h" diff --git a/mozilla/xpfe/bootstrap/nsWindowCreator.cpp b/mozilla/xpfe/bootstrap/nsWindowCreator.cpp index 43720c63041..927a741986d 100644 --- a/mozilla/xpfe/bootstrap/nsWindowCreator.cpp +++ b/mozilla/xpfe/bootstrap/nsWindowCreator.cpp @@ -53,6 +53,7 @@ #include "nsAppShellCIDs.h" #include "nsIAppShellService.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIServiceManager.h" #include "nsIXULWindow.h" #include "nsIWebBrowserChrome.h" diff --git a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp index 1d3475bf3f2..bb345015647 100644 --- a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp @@ -58,9 +58,9 @@ #include "nsVoidArray.h" #include "nsXPIDLString.h" #include "rdf.h" -#include "nsIInterfaceRequestor.h" #include "nsITextToSubURI.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIFTPChannel.h" #include "nsIWindowWatcher.h" #include "nsIPrompt.h" diff --git a/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp b/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp index 39f2aa99b76..f99c2290192 100644 --- a/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp +++ b/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp @@ -32,6 +32,7 @@ #include "nsIHttpChannel.h" #include "nsXPIDLString.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIExternalHelperAppService.h" #include "nsIStringBundle.h" #include "nsIFilePicker.h" diff --git a/mozilla/xpfe/components/xfer/src/nsStreamXferOp.h b/mozilla/xpfe/components/xfer/src/nsStreamXferOp.h index 1b1bdec53c6..54d00da8660 100644 --- a/mozilla/xpfe/components/xfer/src/nsStreamXferOp.h +++ b/mozilla/xpfe/components/xfer/src/nsStreamXferOp.h @@ -24,6 +24,7 @@ #include "nsIStreamTransferOperation.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIProgressEventSink.h" #include "nsIStreamListener.h" #include "nsIChannel.h" diff --git a/mozilla/xpinstall/src/nsXPInstallManager.h b/mozilla/xpinstall/src/nsXPInstallManager.h index 9ee5764b02a..0978f45b389 100644 --- a/mozilla/xpinstall/src/nsXPInstallManager.h +++ b/mozilla/xpinstall/src/nsXPInstallManager.h @@ -46,6 +46,7 @@ #include "nsIProgressEventSink.h" #include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsPIXPIManagerCallbacks.h" #include "nsIDialogParamBlock.h"