corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the call to stop before firing the BeginLoadURL notification... This will keep the BeginLoad/EndLoad notifications paired correctly...

Browse Source
This commit is contained in:
rpotts@netscape.com
1998-10-19 20:41:50 +00:00
parent f1f45a6a7c
commit d982520126
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docshell/base/nsWebShell.cpp
View File

@@ -1083,6 +1083,10 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
} }
ShowHistory(); ShowHistory();
// Stop loading the current document (if any...). This call may result in
// firing an EndLoadURL notification for the old document...
Stop();
// Tell web-shell-container we are loading a new url // Tell web-shell-container we are loading a new url
if (nsnull != mContainer) { if (nsnull != mContainer) {
rv = mContainer->BeginLoadURL(this, urlSpec); rv = mContainer->BeginLoadURL(this, urlSpec);
@@ -1091,8 +1095,6 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
} }
} }
Stop();
rv = mDocLoader->LoadDocument(urlSpec, // URL string rv = mDocLoader->LoadDocument(urlSpec, // URL string
nsnull, // Command nsnull, // Command
this, // Container this, // Container
@@ -1185,6 +1187,10 @@ nsWebShell::GoTo(PRInt32 aHistoryIndex)
mHistoryIndex = aHistoryIndex; mHistoryIndex = aHistoryIndex;
ShowHistory(); ShowHistory();
// Stop loading the current document (if any...). This call may result in
// firing an EndLoadURL notification for the old document...
Stop();
// Tell web-shell-container we are loading a new url // Tell web-shell-container we are loading a new url
if (nsnull != mContainer) { if (nsnull != mContainer) {
rv = mContainer->BeginLoadURL(this, urlSpec); rv = mContainer->BeginLoadURL(this, urlSpec);
@@ -1193,9 +1199,6 @@ nsWebShell::GoTo(PRInt32 aHistoryIndex)
} }
} }
// Stop any documents that are currently being loaded...
mDocLoader->Stop();
rv = mDocLoader->LoadDocument(urlSpec, // URL string rv = mDocLoader->LoadDocument(urlSpec, // URL string
nsnull, // Command nsnull, // Command
this, // Container this, // Container

13
webshell/src/nsWebShell.cpp
View File

@@ -1083,6 +1083,10 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
} }
ShowHistory(); ShowHistory();
// Stop loading the current document (if any...). This call may result in
// firing an EndLoadURL notification for the old document...
Stop();
// Tell web-shell-container we are loading a new url // Tell web-shell-container we are loading a new url
if (nsnull != mContainer) { if (nsnull != mContainer) {
rv = mContainer->BeginLoadURL(this, urlSpec); rv = mContainer->BeginLoadURL(this, urlSpec);
@@ -1091,8 +1095,6 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
} }
} }
Stop();
rv = mDocLoader->LoadDocument(urlSpec, // URL string rv = mDocLoader->LoadDocument(urlSpec, // URL string
nsnull, // Command nsnull, // Command
this, // Container this, // Container
@@ -1185,6 +1187,10 @@ nsWebShell::GoTo(PRInt32 aHistoryIndex)
mHistoryIndex = aHistoryIndex; mHistoryIndex = aHistoryIndex;
ShowHistory(); ShowHistory();
// Stop loading the current document (if any...). This call may result in
// firing an EndLoadURL notification for the old document...
Stop();
// Tell web-shell-container we are loading a new url // Tell web-shell-container we are loading a new url
if (nsnull != mContainer) { if (nsnull != mContainer) {
rv = mContainer->BeginLoadURL(this, urlSpec); rv = mContainer->BeginLoadURL(this, urlSpec);
@@ -1193,9 +1199,6 @@ nsWebShell::GoTo(PRInt32 aHistoryIndex)
} }
} }
// Stop any documents that are currently being loaded...
mDocLoader->Stop();
rv = mDocLoader->LoadDocument(urlSpec, // URL string rv = mDocLoader->LoadDocument(urlSpec, // URL string
nsnull, // Command nsnull, // Command
this, // Container this, // Container