Changed OnEndDocumentLoad(...) to use the document loader as the descriminator to decide if it should handle the notification...
git-svn-id: svn://10.0.0.236/branches/SeaMonkey_M9_BRANCH@43578 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -2782,7 +2782,6 @@ nsWebShell::ReloadDocument(const char* aCharset,
|
||||
mHintCharsetSource= aSource;
|
||||
|
||||
return Reload( nsIChannel::LOAD_NORMAL);
|
||||
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
@@ -3232,7 +3231,8 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
#endif
|
||||
|
||||
if (!mProcessedEndDocumentLoad) {
|
||||
//if (!mProcessedEndDocumentLoad) {
|
||||
if (loader == mDocLoader) {
|
||||
mProcessedEndDocumentLoad = PR_TRUE;
|
||||
|
||||
if (nsnull != mScriptGlobal) {
|
||||
|
||||
@@ -2782,7 +2782,6 @@ nsWebShell::ReloadDocument(const char* aCharset,
|
||||
mHintCharsetSource= aSource;
|
||||
|
||||
return Reload( nsIChannel::LOAD_NORMAL);
|
||||
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
@@ -3232,7 +3231,8 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
#endif
|
||||
|
||||
if (!mProcessedEndDocumentLoad) {
|
||||
//if (!mProcessedEndDocumentLoad) {
|
||||
if (loader == mDocLoader) {
|
||||
mProcessedEndDocumentLoad = PR_TRUE;
|
||||
|
||||
if (nsnull != mScriptGlobal) {
|
||||
|
||||
Reference in New Issue
Block a user