Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 15:51:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#99666 page is displayed as blank in certain situation

Browse Source 
r=harishd, sr=rpotts
This commit is contained in:
shanjian%netscape.com 2001-09-21 02:38:37 +00:00
parent f0c3a9ac67
commit 15155bec60
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docshell/base/nsWebShell.cpp
View File

@ -589,7 +589,8 @@ nsWebShell::ReloadDocument(const char* aCharset,
}
}
}
return NS_OK;
//return failer if this request is not accepted due to mCharsetReloadState
return NS_ERROR_WEBSHELL_REQUEST_REJECTED;
}
@ -598,9 +599,11 @@ nsWebShell::StopDocumentLoad(void)
{
if(eCharsetReloadRequested != mCharsetReloadState)
{
Stop(nsIWebNavigation::STOP_ALL);
Stop(nsIWebNavigation::STOP_ALL);
return NS_OK;
}
return NS_OK;
//return failer if this request is not accepted due to mCharsetReloadState
return NS_ERROR_WEBSHELL_REQUEST_REJECTED;
}
NS_IMETHODIMP
@ -610,9 +613,11 @@ nsWebShell::SetRendering(PRBool aRender)
{
if (mContentViewer) {
mContentViewer->SetEnableRendering(aRender);
return NS_OK;
}
}
return NS_OK;
//return failer if this request is not accepted due to mCharsetReloadState
return NS_ERROR_WEBSHELL_REQUEST_REJECTED;
}
//----------------------------------------------------------------------

3
docshell/base/nsWebShell.h
View File

@ -22,6 +22,7 @@
#ifndef webshell____h
#define webshell____h
#include "nsError.h"
#include "nsIWebShellServices.h"
#include "nsIWebShell.h"
#include "nsILinkHandler.h"
@ -37,6 +38,8 @@ typedef enum {
eCharsetReloadStopOrigional
} eCharsetReloadState;
#define NS_ERROR_WEBSHELL_REQUEST_REJECTED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL,1001)
class nsWebShell : public nsDocShell,
public nsIWebShell,
public nsIWebShellContainer,

6
intl/chardet/src/nsObserverBase.cpp
View File

@ -102,5 +102,9 @@ NS_IMETHODIMP nsObserverBase::NotifyWebShell(
}
}
}
return rv;
//if our reload request is not accepted, we should tell parser to go on
if (rv != NS_ERROR_HTMLPARSER_STOPPARSING)
rv = NS_ERROR_HTMLPARSER_CONTINUE;
return rv;
}