Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-01 11:27:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for I18N reload issue

Browse Source
This commit is contained in:
rhp%netscape.com 1999-08-18 01:39:20 +00:00
parent 0031f4ab09
commit 74bc28bd69
2 changed files with 16 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
docshell/base/nsWebShell.cpp
View File

@ -2770,67 +2770,19 @@ nsWebShell::LoadDocument(const char* aURL,
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHODIMP
nsWebShell::ReloadDocument(const char* aCharset,
nsCharsetSource aSource)
{
nsCharsetSource aSource)
{
// XXX hack. kee the aCharset and aSource wait to pick it up
mHintCharset = aCharset;
mHintCharsetSource= aSource;
// XXX hack. kee the aCharset and aSource wait to pick it up
mHintCharset = aCharset;
mHintCharsetSource= aSource;
nsString * s=nsnull;
/* The generic session history code that is in webshell
* is now obsolete. Use nsISessionHistory instead
*/
#ifdef OLD_HISTORY
s = (nsString*) mHistory.ElementAt(mHistoryIndex);
#else
if (mSHist) {
PRInt32 indix = 0;
nsresult rv;
rv = mSHist->getCurrentIndex(indix);
if (NS_SUCCEEDED(rv)) {
const PRUnichar * url=nsnull;
rv = mSHist->GetURLForIndex(indix, &url);
if (NS_SUCCEEDED(rv))
s = new nsString(url);
}
}
#endif
nsresult rv = NS_OK;
if(s) {
char* url = s->ToNewCString();
if(url) {
#ifdef OLD_HISTORY
/* Don't just decrement the index, remove the element too.
* Just decrementing the index, causes some kind of corruption
* in mHistory and crash in LoadURL(). The element anyway
* gets appended back in LoadURL();
*/
if (mHistoryIndex >= 0) {
mHistory.RemoveElementAt(mHistoryIndex);
mHistoryIndex--;
}
#endif /* OLD_HISTORY */
/* When using nsISessionHistory, the refresh callback should
* probably call LoadURL with PR_FALSE as the third argument.
* Not sure how well this method is being used.
*/
rv = this->RefreshURL((const char*)url,0,PR_FALSE);
delete [] url;
}
delete s;
}
return NS_OK;
return Reload( nsIChannel::LOAD_NORMAL);
}
NS_IMETHODIMP
nsWebShell::StopDocumentLoad(void)
{

64
webshell/src/nsWebShell.cpp
View File

@ -2770,67 +2770,19 @@ nsWebShell::LoadDocument(const char* aURL,
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHODIMP
nsWebShell::ReloadDocument(const char* aCharset,
nsCharsetSource aSource)
{
nsCharsetSource aSource)
{
// XXX hack. kee the aCharset and aSource wait to pick it up
mHintCharset = aCharset;
mHintCharsetSource= aSource;
// XXX hack. kee the aCharset and aSource wait to pick it up
mHintCharset = aCharset;
mHintCharsetSource= aSource;
nsString * s=nsnull;
/* The generic session history code that is in webshell
* is now obsolete. Use nsISessionHistory instead
*/
#ifdef OLD_HISTORY
s = (nsString*) mHistory.ElementAt(mHistoryIndex);
#else
if (mSHist) {
PRInt32 indix = 0;
nsresult rv;
rv = mSHist->getCurrentIndex(indix);
if (NS_SUCCEEDED(rv)) {
const PRUnichar * url=nsnull;
rv = mSHist->GetURLForIndex(indix, &url);
if (NS_SUCCEEDED(rv))
s = new nsString(url);
}
}
#endif
nsresult rv = NS_OK;
if(s) {
char* url = s->ToNewCString();
if(url) {
#ifdef OLD_HISTORY
/* Don't just decrement the index, remove the element too.
* Just decrementing the index, causes some kind of corruption
* in mHistory and crash in LoadURL(). The element anyway
* gets appended back in LoadURL();
*/
if (mHistoryIndex >= 0) {
mHistory.RemoveElementAt(mHistoryIndex);
mHistoryIndex--;
}
#endif /* OLD_HISTORY */
/* When using nsISessionHistory, the refresh callback should
* probably call LoadURL with PR_FALSE as the third argument.
* Not sure how well this method is being used.
*/
rv = this->RefreshURL((const char*)url,0,PR_FALSE);
delete [] url;
}
delete s;
}
return NS_OK;
return Reload( nsIChannel::LOAD_NORMAL);
}
NS_IMETHODIMP
nsWebShell::StopDocumentLoad(void)
{