From 0614bc090aa9d6e33f4fe7c91f43663aa614b4c8 Mon Sep 17 00:00:00 2001 From: "nisheeth%netscape.com" Date: Thu, 8 Apr 1999 04:08:49 +0000 Subject: [PATCH] Fix for bug 3413. I had to reapply the fix because it got trashed during the work that happened on the document load observation APIs. git-svn-id: svn://10.0.0.236/trunk@26795 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 12 ++++++------ mozilla/webshell/src/nsWebShell.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 1e4b9707504..eeb0778706e 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -2200,6 +2200,12 @@ nsWebShell::OnStartURLLoad(nsIURL* aURL, const char* aContentType, nsIContentViewer* aViewer) { + // XXX This is a temporary hack for meeting the M4 milestone + // for seamonkey. I think Netlib should send a message to all stream listeners + // when it changes the URL like this. That would mean adding a new method + // to nsIStreamListener. Need to talk to Rick, Kipp, Gagan about this. + CheckForTrailingSlash(aURL); + /* *Fire the OnStartDocumentLoad of the webshell observer */ @@ -2480,12 +2486,6 @@ nsWebShell::OnStartBinding(nsIURL* aURL, const char *aContentType) { nsresult rv = NS_OK; - // XXX This is a temporary hack for meeting the M3 Dogfood milestone - // for seamonkey. I think Netlib should send a message to all stream listeners - // when it changes the URL like this. That would mean adding a new method - // to nsIStreamListener. Need to talk to Rick, Kipp, Gagan about this. - CheckForTrailingSlash(aURL); - if (nsnull != mObserver) { rv = mObserver->OnStartBinding(aURL, aContentType); } diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 1e4b9707504..eeb0778706e 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -2200,6 +2200,12 @@ nsWebShell::OnStartURLLoad(nsIURL* aURL, const char* aContentType, nsIContentViewer* aViewer) { + // XXX This is a temporary hack for meeting the M4 milestone + // for seamonkey. I think Netlib should send a message to all stream listeners + // when it changes the URL like this. That would mean adding a new method + // to nsIStreamListener. Need to talk to Rick, Kipp, Gagan about this. + CheckForTrailingSlash(aURL); + /* *Fire the OnStartDocumentLoad of the webshell observer */ @@ -2480,12 +2486,6 @@ nsWebShell::OnStartBinding(nsIURL* aURL, const char *aContentType) { nsresult rv = NS_OK; - // XXX This is a temporary hack for meeting the M3 Dogfood milestone - // for seamonkey. I think Netlib should send a message to all stream listeners - // when it changes the URL like this. That would mean adding a new method - // to nsIStreamListener. Need to talk to Rick, Kipp, Gagan about this. - CheckForTrailingSlash(aURL); - if (nsnull != mObserver) { rv = mObserver->OnStartBinding(aURL, aContentType); }