mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Fix for bug 11657. Pass load type as LOAD_NORMAL when a page is reloaded.
For everything else, pass LOAD_HISTORY as reload type. review=nisheeth, approved=chofmann
This commit is contained in:
parent
43c2c7fadb
commit
a458b20f65
@ -453,9 +453,6 @@ nsHistoryEntry::Load(nsIWebShell * aPrevEntry, PRBool aIsReload) {
|
||||
cur->GetURL(&cURL);
|
||||
|
||||
if (urlChanged || aIsReload) {
|
||||
|
||||
|
||||
|
||||
if (prev) {
|
||||
PRBool isInSHist=PR_FALSE, isLoadingDoc=PR_FALSE;
|
||||
prev->GetIsInSHist(isInSHist);
|
||||
@ -468,7 +465,7 @@ nsHistoryEntry::Load(nsIWebShell * aPrevEntry, PRBool aIsReload) {
|
||||
PRInt32 ccount=0;
|
||||
prev->GetChildCount(ccount);
|
||||
|
||||
prev->LoadURL(cURL, nsnull, PR_FALSE, (nsLoadFlags) LOAD_HISTORY);
|
||||
prev->LoadURL(cURL, nsnull, PR_FALSE, (nsLoadFlags) aIsReload?nsIChannel::LOAD_NORMAL:LOAD_HISTORY);
|
||||
if (aIsReload && (ccount > 0)) {
|
||||
/* If this is a reload, on a page with frames, you want to return
|
||||
* true so that consecutive calls by the frame children in to
|
||||
|
Loading…
Reference in New Issue
Block a user