From 42a9fe0f2561f95e7e10e9923e4e26ecd67cb5eb Mon Sep 17 00:00:00 2001 From: "nisheeth%netscape.com" Date: Mon, 26 Apr 1999 14:54:03 +0000 Subject: [PATCH] Shortened filename to nsIExternalDocLoadObs.h to work around Mac build bustage. Filenames longer than 31 characters are a bad thing on the Mac. git-svn-id: svn://10.0.0.236/trunk@29168 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/uriloader/base/nsDocLoader.cpp | 2 +- mozilla/webshell/public/MANIFEST | 2 +- mozilla/webshell/public/Makefile.in | 2 +- mozilla/webshell/public/makefile.win | 2 +- .../webshell/public/nsIExternalDocLoadObs.h | 79 +++++++++++++++++++ mozilla/webshell/src/nsDocLoader.cpp | 2 +- 6 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 mozilla/webshell/public/nsIExternalDocLoadObs.h diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index 8106f8c25be..940c650065d 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -35,7 +35,7 @@ #include "nsIRefreshUrl.h" #include "nsITimer.h" #include "nsIDocumentLoaderObserver.h" -#include "nsIExternalDocumentLoadObserver.h" +#include "nsIExternalDocLoadObs.h" #include "nsVoidArray.h" #include "nsIHttpURL.h" #include "nsILoadAttribs.h" diff --git a/mozilla/webshell/public/MANIFEST b/mozilla/webshell/public/MANIFEST index a15d220cf80..c275097ae1f 100644 --- a/mozilla/webshell/public/MANIFEST +++ b/mozilla/webshell/public/MANIFEST @@ -7,7 +7,7 @@ nsIContentViewer.h nsIContentViewerContainer.h nsIDocumentLoader.h nsIDocumentLoaderObserver.h -nsIExternalDocumentLoadObserver.h +nsIExternalDocLoadObs.h nsIDocStreamLoaderFactory.h nsIDocumentViewer.h nsILinkHandler.h diff --git a/mozilla/webshell/public/Makefile.in b/mozilla/webshell/public/Makefile.in index 3540f67f561..cecb9429d78 100644 --- a/mozilla/webshell/public/Makefile.in +++ b/mozilla/webshell/public/Makefile.in @@ -30,7 +30,7 @@ EXPORTS = \ nsIContentViewerContainer.h \ nsIDocumentLoader.h \ nsIDocumentLoaderObserver.h \ - nsIExternalDocumentLoadObserver.h \ + nsIExternalDocLoadObs.h \ nsIDocumentViewer.h \ nsILinkHandler.h \ nsIThrobber.h \ diff --git a/mozilla/webshell/public/makefile.win b/mozilla/webshell/public/makefile.win index 3eb2785fa68..e40dc3122cc 100644 --- a/mozilla/webshell/public/makefile.win +++ b/mozilla/webshell/public/makefile.win @@ -27,7 +27,7 @@ EXPORTS = \ nsIContentViewerContainer.h \ nsIDocumentLoader.h \ nsIDocumentLoaderObserver.h \ - nsIExternalDocumentLoadObserver.h \ + nsIExternalDocLoadObs.h \ nsIDocStreamLoaderFactory.h \ nsIDocumentViewer.h \ nsILinkHandler.h \ diff --git a/mozilla/webshell/public/nsIExternalDocLoadObs.h b/mozilla/webshell/public/nsIExternalDocLoadObs.h new file mode 100644 index 00000000000..b4578265c18 --- /dev/null +++ b/mozilla/webshell/public/nsIExternalDocLoadObs.h @@ -0,0 +1,79 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL")=0; you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1999 Netscape Communications Corporation. All Rights + * Reserved. + */ + +/** + * MODULE NOTES: + * + * @update nisheeth 4/25/99 + * + */ + +#ifndef nsIExternalDocumentLoadObserver_h__ +#define nsIExternalDocumentLoadObserver_h__ + +#include "nsIObserver.h" + +/* ba3e9e50-fb7f-11d2-aeea-00108300ff91 */ +#define NS_IEXTERNALDOCUMENTLOADOBSERVER_IID \ +{ 0xba3e9e50, 0xfb7f, 0x11d2, {0xae, 0xea, 0x00, 0x10, 0x83, 0x00, 0xff, 0x91} } + +class nsIExternalDocumentLoadObserver : public nsIObserver { +public: + /** + * Notify the observer that a new document will be loaded. + * + * This notification occurs before any DNS resolution occurs, or + * a connection is established with the server... + */ + NS_IMETHOD OnStartDocumentLoad(PRUint32 aDocumentID, nsString& aURL, const char* aCommand) = 0; + + /** + * Notify the observer that a document has been completely loaded. + */ + NS_IMETHOD OnEndDocumentLoad(PRUint32 aDocumentID, nsString& aURL, PRInt32 aStatus) = 0; + + /** + * Notify the observer that the specified nsIURL has just started to load. + * + * This notification occurs after DNS resolution, and a connection to the + * server has been established. + */ + NS_IMETHOD OnStartURLLoad(PRUint32 aDocumentID, nsString& aURL, const char* aContentType) = 0; + + /** + * Notify the observer that progress has occurred in the loading of the + * specified URL... + */ + NS_IMETHOD OnProgressURLLoad(PRUint32 aDocumentID, nsString& aURL, PRUint32 aProgress, + PRUint32 aProgressMax) = 0; + + /** + * Notify the observer that status text is available regarding the URL + * being loaded... + */ + NS_IMETHOD OnStatusURLLoad(PRUint32 aDocumentID, nsString& aURL, nsString& aMsg) = 0; + + /** + * Notify the observer that the specified nsIURL has finished loading. + */ + NS_IMETHOD OnEndURLLoad(PRUint32 aDocumentID, nsString& aURL, PRInt32 aStatus) = 0; + +}; + +#endif /* nsIExternalDocumentLoadObserver_h__ */ + diff --git a/mozilla/webshell/src/nsDocLoader.cpp b/mozilla/webshell/src/nsDocLoader.cpp index 8106f8c25be..940c650065d 100644 --- a/mozilla/webshell/src/nsDocLoader.cpp +++ b/mozilla/webshell/src/nsDocLoader.cpp @@ -35,7 +35,7 @@ #include "nsIRefreshUrl.h" #include "nsITimer.h" #include "nsIDocumentLoaderObserver.h" -#include "nsIExternalDocumentLoadObserver.h" +#include "nsIExternalDocLoadObs.h" #include "nsVoidArray.h" #include "nsIHttpURL.h" #include "nsILoadAttribs.h"