From c2a00e2a9b2ac781a6b3a4882f09bb51fd283789 Mon Sep 17 00:00:00 2001 From: "tbogard%aol.net" Date: Sat, 11 Mar 2000 01:24:29 +0000 Subject: [PATCH] HandleUnknownContentType is no longer part of the nsIDocumentLoaderObserver interface. git-svn-id: svn://10.0.0.236/trunk@62599 18797224-902f-48f8-a5cc-f745e15eee43 --- .../xmlterm/base/mozXMLTerminal.cpp | 9 ----- .../xmlterm/geckoterm/mozSimpleContainer.cpp | 9 ----- mozilla/htmlparser/robot/nsDebugRobot.cpp | 33 +------------------ .../parser/htmlparser/robot/nsDebugRobot.cpp | 33 +------------------ .../base/nsIDocumentLoaderObserver.idl | 11 +------ 5 files changed, 3 insertions(+), 92 deletions(-) diff --git a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp index fe269aeaa7b..1aec270ac6a 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp @@ -839,12 +839,3 @@ mozXMLTerminal::OnEndURLLoad(nsIDocumentLoader* loader, Activate(); return NS_OK; } - -NS_IMETHODIMP -mozXMLTerminal::HandleUnknownContentType(nsIDocumentLoader* loader, - nsIChannel* channel, - const char *aContentType, - const char *aCommand ) -{ - return NS_OK; -} diff --git a/mozilla/extensions/xmlterm/geckoterm/mozSimpleContainer.cpp b/mozilla/extensions/xmlterm/geckoterm/mozSimpleContainer.cpp index 341819d6418..e71453cc2bc 100644 --- a/mozilla/extensions/xmlterm/geckoterm/mozSimpleContainer.cpp +++ b/mozilla/extensions/xmlterm/geckoterm/mozSimpleContainer.cpp @@ -236,15 +236,6 @@ NS_IMETHODIMP mozSimpleContainer::OnEndURLLoad(nsIDocumentLoader *aLoader, } -NS_IMETHODIMP mozSimpleContainer::HandleUnknownContentType( - nsIDocumentLoader *aLoader, - nsIChannel *aChannel, - const char *aContentType, const char *aCommand) -{ - return NS_OK; -} - - /** Resizes container to new dimensions * @param width new window width (pixels) * @param height new window height (pixels) diff --git a/mozilla/htmlparser/robot/nsDebugRobot.cpp b/mozilla/htmlparser/robot/nsDebugRobot.cpp index 7ff287e947e..0740cc09bb5 100644 --- a/mozilla/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/htmlparser/robot/nsDebugRobot.cpp @@ -137,29 +137,7 @@ public: NS_DECL_ISUPPORTS // nsIDocumentLoaderObserver - NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, - nsIURI* aURL, - const char* aCommand); - NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader, - nsIChannel* channel, - nsresult aStatus); - NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader, - nsIChannel* channel); - NS_IMETHOD OnProgressURLLoad(nsIDocumentLoader* loader, - nsIChannel* channel, - PRUint32 aProgress, - PRUint32 aProgressMax); - NS_IMETHOD OnStatusURLLoad(nsIDocumentLoader* loader, - nsIChannel* channel, - nsString& aMsg); - NS_IMETHOD OnEndURLLoad(nsIDocumentLoader* loader, - nsIChannel* channel, - nsresult aStatus); - NS_IMETHOD HandleUnknownContentType( nsIDocumentLoader* loader, - nsIChannel* channel, - const char *aContentType, - const char *aCommand ); - + NS_DECL_NSIDOCUMENTLOADEROBSERVER }; // document loader observer implementation @@ -213,15 +191,6 @@ CStreamListener::OnEndURLLoad(nsIDocumentLoader* loader, return NS_OK; } -NS_IMETHODIMP -CStreamListener::HandleUnknownContentType(nsIDocumentLoader* loader, - nsIChannel* channel, - const char *aContentType, - const char *aCommand) -{ - return NS_OK; -} - nsresult CStreamListener::QueryInterface(const nsIID& aIID, void** aInstancePtr) { diff --git a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp index 7ff287e947e..0740cc09bb5 100644 --- a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp @@ -137,29 +137,7 @@ public: NS_DECL_ISUPPORTS // nsIDocumentLoaderObserver - NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, - nsIURI* aURL, - const char* aCommand); - NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader, - nsIChannel* channel, - nsresult aStatus); - NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader, - nsIChannel* channel); - NS_IMETHOD OnProgressURLLoad(nsIDocumentLoader* loader, - nsIChannel* channel, - PRUint32 aProgress, - PRUint32 aProgressMax); - NS_IMETHOD OnStatusURLLoad(nsIDocumentLoader* loader, - nsIChannel* channel, - nsString& aMsg); - NS_IMETHOD OnEndURLLoad(nsIDocumentLoader* loader, - nsIChannel* channel, - nsresult aStatus); - NS_IMETHOD HandleUnknownContentType( nsIDocumentLoader* loader, - nsIChannel* channel, - const char *aContentType, - const char *aCommand ); - + NS_DECL_NSIDOCUMENTLOADEROBSERVER }; // document loader observer implementation @@ -213,15 +191,6 @@ CStreamListener::OnEndURLLoad(nsIDocumentLoader* loader, return NS_OK; } -NS_IMETHODIMP -CStreamListener::HandleUnknownContentType(nsIDocumentLoader* loader, - nsIChannel* channel, - const char *aContentType, - const char *aCommand) -{ - return NS_OK; -} - nsresult CStreamListener::QueryInterface(const nsIID& aIID, void** aInstancePtr) { diff --git a/mozilla/uriloader/base/nsIDocumentLoaderObserver.idl b/mozilla/uriloader/base/nsIDocumentLoaderObserver.idl index ae8e8078cd7..86c52fde5ac 100644 --- a/mozilla/uriloader/base/nsIDocumentLoaderObserver.idl +++ b/mozilla/uriloader/base/nsIDocumentLoaderObserver.idl @@ -83,15 +83,6 @@ interface nsIDocumentLoaderObserver : nsISupports * Notify the observer that the specified nsIURI has finished loading. */ void onEndURLLoad(in nsIDocumentLoader aLoader, in nsIChannel aChannel, in unsigned long aStatus); - - /** - * Notify the observer that some content of unknown type has been - * encountered... - */ - void handleUnknownContentType(in nsIDocumentLoader aLoader, - in nsIChannel aChannel, - in string aContentType, - in string aCommand); }; /* the following is a transition define. nsIDocumentLoaderObserver wasn't scriptable and now it is. @@ -100,4 +91,4 @@ interface nsIDocumentLoaderObserver : nsISupports %{C++ #define NS_IDOCUMENT_LOADER_OBSERVER_IID NS_IDOCUMENTLOADEROBSERVER_IID -%} \ No newline at end of file +%}