Bug 321504 Remove unneeded uses of nsIDocumentLoader

r+sr=bz

content/html/document/src/nsHTMLDocument.cpp

@@ -76,7 +76,6 @@
 #include "nsIWebNavigation.h"
 #include "nsIBaseWindow.h"
 #include "nsIWebShellServices.h"
-#include "nsIDocumentLoader.h"
 #include "nsIScriptContext.h"
 #include "nsIXPConnect.h"
 #include "nsContentList.h"

content/xml/document/src/nsXMLDocument.cpp

@@ -49,7 +49,6 @@
 #include "nsIContentViewer.h"
 #include "nsIDocShell.h"
 #include "nsIMarkupDocumentViewer.h"
-#include "nsIDocumentLoader.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLStyleSheet.h"
 #include "nsIHTMLCSSStyleSheet.h"

content/xul/document/src/nsXULContentSink.cpp

@@ -61,7 +61,6 @@
 #include "nsIDOMHTMLFormElement.h"
 #include "nsIDOMXULDocument.h"
 #include "nsIDocument.h"
-#include "nsIDocumentLoader.h"
 #include "nsIFormControl.h"
 #include "nsHTMLStyleSheet.h"
 #include "nsINameSpaceManager.h"

docshell/base/nsWebShell.cpp

@@ -43,7 +43,6 @@
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIWebProgress.h"
-#include "nsIDocumentLoader.h"
 #include "nsIContentViewer.h"
 #include "nsIDocumentViewer.h"
 #include "nsIMarkupDocumentViewer.h"

docshell/base/nsWebShell.h

@@ -46,7 +46,6 @@
 #include "nsICommandManager.h"
 #include "nsIIOService.h"
 #include "nsCRT.h"
-#include "nsIDocumentLoader.h"
 
 class nsIEventQueue;
 class nsIController;

dom/src/base/nsScreen.cpp

@@ -45,7 +45,6 @@
 #include "nsPresContext.h"
 #include "nsCOMPtr.h"
 #include "nsIDocumentViewer.h"
-#include "nsIDocumentLoader.h"
 #include "nsDOMClassInfo.h"
 
 

extensions/access-builtin/accessproxy/nsAccessProxy.cpp

@@ -42,7 +42,6 @@
 #include "nsIObserverService.h"
 #include "nsIGenericFactory.h"
 #include "nsIWebProgress.h"
-#include "nsIDocumentLoader.h"
 #include "nsCURILoader.h"
 #include "nsIDocShell.h"
 #include "nsIDOMWindow.h"

extensions/typeaheadfind/src/nsTypeAheadFind.cpp

@@ -41,7 +41,6 @@
 #include "nsIServiceManager.h"
 #include "nsIGenericFactory.h"
 #include "nsIWebBrowserChrome.h"
-#include "nsIDocumentLoader.h"
 #include "nsCURILoader.h"
 #include "nsNetUtil.h"
 #include "nsIURL.h"

extensions/wallet/src/nsWalletService.cpp

@@ -48,7 +48,6 @@
 #include "nsIDOMHTMLFormElement.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
-#include "nsIDocumentLoader.h"
 #include "nsCURILoader.h"
 #include "nsIDOMHTMLInputElement.h"
 #include "nsIFormControl.h"
@@ -308,19 +307,17 @@ nsresult nsWalletlibService::Init()
     svc->AddObserver(this, "login-failed", PR_TRUE);
   }
   else
-    NS_ASSERTION(PR_FALSE, "Could not get nsIObserverService");
+    NS_ERROR("Could not get nsIObserverService");
 
   // Get the global document loader service...
-  nsCOMPtr<nsIDocumentLoader> docLoaderService =
+  nsCOMPtr<nsIWebProgress> progress =
            do_GetService(kDocLoaderServiceCID, &rv);
-  if (NS_SUCCEEDED(rv) && docLoaderService) {
-    nsCOMPtr<nsIWebProgress> progress(do_QueryInterface(docLoaderService, &rv));
-    if (NS_SUCCEEDED(rv))
-        (void) progress->AddProgressListener((nsIWebProgressListener*)this,
-                                        nsIWebProgress::NOTIFY_STATE_DOCUMENT);
+  if (NS_SUCCEEDED(rv)) {
+    (void) progress->AddProgressListener((nsIWebProgressListener*)this,
+                                    nsIWebProgress::NOTIFY_STATE_DOCUMENT);
   }
   else
-    NS_ASSERTION(PR_FALSE, "Could not get nsIDocumentLoader");
+    NS_ERROR("Could not get nsIWebProgress");
 
   /* initialize the expire-master-password feature */
   nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));

extensions/xmlterm/base/mozXMLTermStream.h

@@ -1,121 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 XMLterm.
- *
- * The Initial Developer of the Original Code is
- * Ramalingam Saravanan.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// mozXMLTermStream.h: declaration of mozXMLTermStream
-// which implements the mozIXMLTermStream interface
-// to display HTML/XML streams as documents
-
-#include "nscore.h"
-#include "nspr.h"
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsIGenericFactory.h"
-
-#include "nsIDOMWindowInternal.h"
-#include "nsIDOMWindowCollection.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMNode.h"
-#include "nsIDOMNodeList.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMHTMLDocument.h"
-#include "nsIDocument.h"
-
-#include "nsIDocumentLoader.h"
-#include "nsIDocumentLoaderFactory.h"
-
-#include "nsIURL.h"
-#include "nsNetUtil.h"
-#include "nsIIOService.h"
-
-#include "nsIPresShell.h"
-#include "nsIScriptContext.h"
-
-#include "mozXMLT.h"
-#include "mozIXMLTermStream.h"
-
-#define NO_WORKAROUND
-
-class mozXMLTermStream : public mozIXMLTermStream
-{
-  public:
-
-  mozXMLTermStream();
-  virtual ~mozXMLTermStream();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIINPUTSTREAM
-  NS_DECL_MOZIXMLTERMSTREAM
-
- protected:
-
-  /** Adjusts height of frame displaying stream to fit content
-   * @param maxHeight maximum height of resized frame (pixels)
-   *                  (zero value implies no maximum)
-   */
-  NS_IMETHOD SizeToContentHeight(PRInt32 maxHeight);
-
-  /** UTF8 data buffer to hold to be read by rendering engine */
-  nsCString mUTF8Buffer;
-
-  /** offset at which to start reading the UTF8 data buffer */
-  PRUint32 mUTF8Offset;
-
-  /** maximum frame height for resizing */
-  PRInt32 mMaxResizeHeight;
-
-  /** DOM window in which to display stream */
-  nsCOMPtr<nsIDOMWindowInternal> mDOMWindow;
-
-  /** Frame element in which to display stream */
-  nsCOMPtr<nsIDOMElement> mDOMIFrameElement;
-
-#ifdef NO_WORKAROUND
-  /** Context for stream display */
-  nsCOMPtr<nsISupports> mContext;
-
-  /** Load group for stream display */
-  nsCOMPtr<nsILoadGroup> mLoadGroup;
-
-  /** Channel for stream display */
-  nsCOMPtr<nsIChannel> mChannel;
-
-  /** Stream listener object */
-  nsCOMPtr<nsIStreamListener> mStreamListener;
-#else // !NO_WORKAROUND
-  nsCOMPtr<nsIDOMHTMLDocument> mDOMHTMLDocument;
-#endif // !NO_WORKAROUND
-};
-

layout/build/nsContentDLF.cpp

@@ -42,7 +42,6 @@
 #include "nsIComponentManager.h"
 #include "nsIComponentRegistrar.h"
 #include "nsICategoryManager.h"
-#include "nsIDocumentLoader.h"
 #include "nsIDocumentLoaderFactory.h"
 #include "nsIDocument.h"
 #include "nsIDocumentViewer.h"

layout/generic/nsFrameFrame.cpp

@@ -64,7 +64,6 @@
 #include "nsStyleCoord.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIDocumentLoader.h"
 #include "nsFrameSetFrame.h"
 #include "nsIDOMHTMLFrameElement.h"
 #include "nsIDOMHTMLIFrameElement.h"

layout/generic/nsFrameSetFrame.cpp

@@ -56,7 +56,6 @@
 #include "nsStyleCoord.h"
 #include "nsStyleConsts.h"
 #include "nsStyleContext.h"
-#include "nsIDocumentLoader.h"
 #include "nsHTMLParts.h"
 #include "nsILookAndFeel.h"
 #include "nsWidgetsCID.h"

mailnews/base/src/nsMsgWindow.cpp

@@ -46,7 +46,6 @@
 #include "nsIDOMWindowInternal.h"
 #include "nsTransactionManagerCID.h"
 #include "nsIComponentManager.h"
-#include "nsIDocumentLoader.h"
 #include "nsILoadGroup.h"
 #include "nsIMsgMailNewsUrl.h"
 #include "nsIInterfaceRequestor.h"

mailnews/base/util/nsMsgMailNewsUrl.cpp

@@ -42,7 +42,6 @@
 #include "nsIMsgAccountManager.h"
 #include "nsXPIDLString.h"
 #include "nsReadableUtils.h"
-#include "nsIDocumentLoader.h"
 #include "nsILoadGroup.h"
 #include "nsIDocShell.h"
 #include "nsIWebProgress.h"

security/manager/boot/src/nsSecureBrowserUIImpl.cpp

@@ -56,7 +56,6 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIServiceManager.h"
 #include "nsIObserverService.h"
-#include "nsIDocumentLoader.h"
 #include "nsCURILoader.h"
 #include "nsIDocShell.h"
 #include "nsIDocumentViewer.h"

toolkit/components/passwordmgr/base/nsPasswordManager.cpp

@@ -52,7 +52,6 @@
 #include "nsArray.h"
 #include "nsICategoryManager.h"
 #include "nsIObserverService.h"
-#include "nsIDocumentLoader.h"
 #include "nsIWebProgress.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMWindow.h"
@@ -273,11 +272,8 @@ nsPasswordManager::Init()
 
   obsService->AddObserver(this, NS_FORMSUBMIT_SUBJECT, PR_TRUE);
 
-  nsCOMPtr<nsIDocumentLoader> docLoaderService = do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID);
-  NS_ASSERTION(docLoaderService, "No document loader service");
-
-  nsCOMPtr<nsIWebProgress> progress = do_QueryInterface(docLoaderService);
-  NS_ASSERTION(progress, "docloader service does not implement nsIWebProgress");
+  nsCOMPtr<nsIWebProgress> progress = do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID);
+  NS_ASSERTION(docLoaderService, "No web progress service");
 
   progress->AddProgressListener(this, nsIWebProgress::NOTIFY_STATE_DOCUMENT);
 

toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp

@@ -43,7 +43,6 @@
 #include "nsIServiceManager.h"
 #include "nsIGenericFactory.h"
 #include "nsIWebBrowserChrome.h"
-#include "nsIDocumentLoader.h"
 #include "nsCURILoader.h"
 #include "nsNetUtil.h"
 #include "nsIURL.h"

xpfe/appshell/src/nsWebShellWindow.cpp

@@ -42,7 +42,6 @@
 #include "nsLayoutCID.h"
 #include "nsContentCID.h"
 #include "nsIWeakReference.h"
-#include "nsIDocumentLoader.h"
 
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
@@ -96,7 +95,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMElement.h"
-#include "nsIDocumentLoader.h"
 #include "nsIDocumentLoaderFactory.h"
 #include "nsIObserverService.h"
 #include "prprf.h"

xpfe/components/directory/nsDirectoryViewer.cpp

@@ -57,7 +57,6 @@
 #include "nsCOMPtr.h"
 #include "nsCRT.h"
 #include "nsEscape.h"
-#include "nsIDocumentLoader.h"
 #include "nsIEnumerator.h"
 #include "nsIRDFService.h"
 #include "nsIScriptContext.h"