mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix for bug # 17893. Pass the url to nsISessionHistory::Add().Don't set 

nsWebShell::mURL too early in the loading process.
r=law,nisheeth
This commit is contained in:
radha%netscape.com 1999-11-03 22:30:44 +00:00
Родитель d474206441
Коммит a0e755871b
5 изменённых файлов: 91 добавлений и 67 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

44
docshell/base/nsWebShell.cpp
Просмотреть файл

@ -2268,11 +2268,14 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
// Get hold of Root webshell
nsCOMPtr<nsIWebShell> root;
nsCOMPtr<nsISessionHistory> shist;
PRBool isLoadingHistory=PR_FALSE; // Is SH currently loading an entry from history?
rv = GetRootWebShell(*getter_AddRefs(root));
// Get hold of session History
if (NS_SUCCEEDED(rv) && root) {
root->GetSessionHistory(*getter_AddRefs(shist));
}
if (shist)
shist->GetLoadingFlag(&isLoadingHistory);
/* Ask the URL dispatcher to take care of this URL only if it is a
* mailto: link clicked inside a browser. Note this mechanism s'd go
@ -2312,32 +2315,39 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
* session History.
*/
SetHistoryState(aHistoryState);
/*
* Set mURL to spec so that session history can get
* hold of the url and change it if it has to.
* See comments below.
*/
mURL = spec;
/* Add the page to session history */
if (aModifyHistory && shist) {
PRInt32 ret;
ret = shist->Add(this);
ret = shist->Add(spec, this);
}
nsCOMPtr<nsIWebShell> parent;
nsresult res = GetParent(*getter_AddRefs(parent));
nsAutoString urlstr;
/* If we are going "Back" from a non-frame page to a frame page,
* session history will change the mURL to the right value
* for smoother redraw. So, create a new nsIURI based on mURL,
* so that it will work right in such situations.
*/
nsAutoString urlstr(mURL);
if ((isLoadingHistory)) {
/* if LoadURL() got called from SH, AND If we are going "Back/Forward"
* to a frame page,SH will change the mURL to the right value
* for smoother redraw. So, create a new nsIURI based on mURL,
* so that it will work right in such situations.
*/
urlstr = mURL;
}
else{
/* If the call is not from SH, use the url passed by the caller
* so that things like JS will work right. This is for bug # 1646.
* May regress in other situations.
* What a hack
*/
urlstr=spec;
}
nsCOMPtr<nsIURI> newURI;
rv = NS_NewURI(getter_AddRefs(newURI), urlstr, nsnull);
res = NS_NewURI(getter_AddRefs(newURI), urlstr, nsnull);
if (NS_SUCCEEDED(rv)) {
if (NS_SUCCEEDED(res)) {
// now that we have a uri, call the REAL LoadURI method which requires a nsIURI.
return LoadURI(newURI, aCommand, aPostDataStream, aModifyHistory, aType, aLocalIP, aHistoryState, aReferrer);
}

44
webshell/src/nsWebShell.cpp
Просмотреть файл

@ -2268,11 +2268,14 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
// Get hold of Root webshell
nsCOMPtr<nsIWebShell> root;
nsCOMPtr<nsISessionHistory> shist;
PRBool isLoadingHistory=PR_FALSE; // Is SH currently loading an entry from history?
rv = GetRootWebShell(*getter_AddRefs(root));
// Get hold of session History
if (NS_SUCCEEDED(rv) && root) {
root->GetSessionHistory(*getter_AddRefs(shist));
}
if (shist)
shist->GetLoadingFlag(&isLoadingHistory);
/* Ask the URL dispatcher to take care of this URL only if it is a
* mailto: link clicked inside a browser. Note this mechanism s'd go
@ -2312,32 +2315,39 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
* session History.
*/
SetHistoryState(aHistoryState);
/*
* Set mURL to spec so that session history can get
* hold of the url and change it if it has to.
* See comments below.
*/
mURL = spec;
/* Add the page to session history */
if (aModifyHistory && shist) {
PRInt32 ret;
ret = shist->Add(this);
ret = shist->Add(spec, this);
}
nsCOMPtr<nsIWebShell> parent;
nsresult res = GetParent(*getter_AddRefs(parent));
nsAutoString urlstr;
/* If we are going "Back" from a non-frame page to a frame page,
* session history will change the mURL to the right value
* for smoother redraw. So, create a new nsIURI based on mURL,
* so that it will work right in such situations.
*/
nsAutoString urlstr(mURL);
if ((isLoadingHistory)) {
/* if LoadURL() got called from SH, AND If we are going "Back/Forward"
* to a frame page,SH will change the mURL to the right value
* for smoother redraw. So, create a new nsIURI based on mURL,
* so that it will work right in such situations.
*/
urlstr = mURL;
}
else{
/* If the call is not from SH, use the url passed by the caller
* so that things like JS will work right. This is for bug # 1646.
* May regress in other situations.
* What a hack
*/
urlstr=spec;
}
nsCOMPtr<nsIURI> newURI;
rv = NS_NewURI(getter_AddRefs(newURI), urlstr, nsnull);
res = NS_NewURI(getter_AddRefs(newURI), urlstr, nsnull);
if (NS_SUCCEEDED(rv)) {
if (NS_SUCCEEDED(res)) {
// now that we have a uri, call the REAL LoadURI method which requires a nsIURI.
return LoadURI(newURI, aCommand, aPostDataStream, aModifyHistory, aType, aLocalIP, aHistoryState, aReferrer);
}

2
xpfe/appshell/public/nsISessionHistory.idl
Просмотреть файл

@ -60,7 +60,7 @@ interface nsISessionHistory: nsISupports
/**
* Add a new URL to the History List
*/
[noscript] void add(in nsIWebShell aContainer);
[noscript] void add(in string url, in nsIWebShell aContainer);
/**
* Goto to a particular point in history

59
xpfe/appshell/src/nsSessionHistory.cpp
Просмотреть файл

@ -47,7 +47,7 @@ static NS_DEFINE_IID(kIHistoryEntryIID, NS_IHISTORY_ENTRY_IID);
// Advance declarations
class nsHistoryEntry;
static nsHistoryEntry * GenerateTree(nsIWebShell * aWebShell,nsHistoryEntry *aparent, nsISessionHistory * aSHist);
static nsHistoryEntry * GenerateTree(const char * aStickyURL, nsIWebShell * aStickyContainer, nsIWebShell * aContainer,nsHistoryEntry *aParent, nsISessionHistory * aSHist);
#define APP_DEBUG 0
@ -67,7 +67,7 @@ public:
* Create the History data structures for the current URL. This method
* will also generate the history tree for the URL if it contains frames
*/
nsresult Create(nsIWebShell * aWebShell, nsHistoryEntry * aParent, nsISessionHistory * aSHist);
nsresult Create(const char * aURL, nsIWebShell * aWebShell, nsHistoryEntry * aParent, nsISessionHistory * aSHist);
/**
* Load the entry in the content Area
@ -378,14 +378,11 @@ nsHistoryEntry::AddChild(nsHistoryEntry* aChild)
*/
nsresult
nsHistoryEntry::Create(nsIWebShell * aWebShell, nsHistoryEntry * aParent, nsISessionHistory * aSHist) {
const PRUnichar * url = nsnull;
nsHistoryEntry::Create(const char * aURL, nsIWebShell * aWebShell, nsHistoryEntry * aParent, nsISessionHistory * aSHist) {
// Get the webshell's url.
aWebShell->GetURL(&url);
nsAutoString urlstr(url);
// aWebShell->GetURL(&url);
nsAutoString urlstr(aURL);
// save the webshell's URL in the history entry
char * urlcstr = urlstr.ToNewCString();
@ -407,9 +404,12 @@ nsHistoryEntry::Create(nsIWebShell * aWebShell, nsHistoryEntry * aParent, nsISes
}
static nsHistoryEntry *
GenerateTree(nsIWebShell * aWebShell, nsHistoryEntry * aParent, nsISessionHistory * aSHist) {
GenerateTree(const char * aStickyUrl, nsIWebShell * aStickyContainer, nsIWebShell * aContainer, nsHistoryEntry * aParent, nsISessionHistory * aSHist) {
nsHistoryEntry * hEntry = nsnull;
const PRUnichar * url = nsnull;
const char * aCStr = nsnull;
nsAutoString urlAStr;
hEntry = new nsHistoryEntry;
@ -418,21 +418,30 @@ GenerateTree(nsIWebShell * aWebShell, nsHistoryEntry * aParent, nsISessionHistor
return (nsHistoryEntry *)nsnull;
}
hEntry->Create(aWebShell, aParent, aSHist);
if (aStickyContainer == aContainer) {
hEntry->Create(aStickyUrl, aContainer, aParent, aSHist);
}
else {
// Get the webshell's url.
aContainer->GetURL(&url);
urlAStr = (url);
aCStr = urlAStr.ToNewCString();
hEntry->Create(aCStr, aContainer, aParent, aSHist);
Recycle((char *) aCStr);
}
// If the webshell has children, go thro' the child list and create
// the history tree for the children recursively.
PRInt32 cnt = 0;
aWebShell->GetChildCount(cnt);
aContainer->GetChildCount(cnt);
if (cnt > 0) {
for (int i=0; i<cnt; i++) {
nsIWebShell * childWS = nsnull;
nsCOMPtr<nsIWebShell> childWS;
//nsHistoryEntry * hChild = nsnull;
aWebShell->ChildAt(i, childWS);
aContainer->ChildAt(i, (*getter_AddRefs(childWS)));
if (childWS) {
GenerateTree(childWS, hEntry, aSHist);
GenerateTree(aStickyUrl, aStickyContainer, childWS, hEntry, aSHist);
}
}
}
@ -534,6 +543,7 @@ nsHistoryEntry::Load(nsIWebShell * aPrevEntry, PRBool aIsReload) {
if (!aIsReload)
loadType = (nsLoadType) nsISessionHistory::LOAD_HISTORY;
PRUnichar * uniURL = cSURL.ToNewUnicode();
prev->SetURL(uniURL);
prev->LoadURL(uniURL, nsnull, PR_FALSE, loadType, 0, historyObject);
Recycle(uniURL);
@ -585,9 +595,9 @@ nsHistoryEntry::Load(nsIWebShell * aPrevEntry, PRBool aIsReload) {
for (i=0; i<cnt; i++){
nsHistoryEntry *cChild=nsnull;
nsIWebShell * pChild=nsnull;
nsCOMPtr<nsIWebShell> pChild;
cur->GetChildAt(i, cChild); // historyentry
prev->ChildAt(i, pChild); //webshell
prev->ChildAt(i, (*getter_AddRefs(pChild))); //webshell
result = cChild->Load(pChild, PR_FALSE);
if (result)
break;
@ -672,9 +682,9 @@ nsHistoryEntry::Compare(nsIWebShell * aPrevEntry, PRBool aIsReload) {
for (i=0; i<cnt; i++){
nsHistoryEntry *cChild=nsnull;
nsIWebShell * pChild=nsnull;
nsCOMPtr<nsIWebShell> pChild;
cur->GetChildAt(i, cChild); // historyentry
prev->ChildAt(i, pChild); //webshell
prev->ChildAt(i, (*getter_AddRefs(pChild))); //webshell
result = cChild->Compare(pChild, PR_FALSE);
if (result)
break;
@ -787,7 +797,7 @@ NS_IMPL_ISUPPORTS(nsSessionHistory, kISessionHistoryIID);
* by typing in the urlbar.
*/
NS_IMETHODIMP
nsSessionHistory::Add(nsIWebShell * aWebShell)
nsSessionHistory::Add(const char * aURL, nsIWebShell * aWebShell)
{
//nsresult rv = NS_OK;
nsHistoryEntry * hEntry = nsnull;
@ -823,7 +833,7 @@ nsSessionHistory::Add(nsIWebShell * aWebShell)
NS_ASSERTION(PR_FALSE, "nsSessionHistory::add Low memory");
return NS_ERROR_OUT_OF_MEMORY;
}
hEntry->Create(aWebShell, nsnull, this);
hEntry->Create(aURL, aWebShell, nsnull, this);
/* Set the flag in webshell that indicates that it has been
* added to session History
@ -887,7 +897,7 @@ nsSessionHistory::Add(nsIWebShell * aWebShell)
NS_ASSERTION(PR_FALSE, "nsSessionHistory::add Low memory");
return NS_ERROR_OUT_OF_MEMORY;
}
newEntry->Create(aWebShell, parentEntry, this);
newEntry->Create(aURL, aWebShell, parentEntry, this);
aWebShell->SetIsInSHist(PR_TRUE);
if (parentWS)
@ -932,7 +942,7 @@ nsSessionHistory::Add(nsIWebShell * aWebShell)
aWebShell->GetRootWebShell(root);
if (root)
newEntry = GenerateTree(root, nsnull, this);
newEntry = GenerateTree(aURL, aWebShell, root, nsnull, this);
if (newEntry) {
if ((mHistoryLength - (mHistoryCurrentIndex+1)) > 0) {
/* We are somewhere in the middle of the history and a
@ -1112,7 +1122,6 @@ nsSessionHistory::Goto(PRInt32 aGotoIndex, nsIWebShell * prev, PRBool aIsReload)
// Save the history state for the current index before loading the next one
int indix = 0;
GetCurrentIndex(&indix);
PRBool isInHist=PR_FALSE;
if (indix >= 0) {
nsCOMPtr<nsISupports> historyState;
nsresult rv = prev->GetHistoryState(getter_AddRefs(historyState));

9
xpfe/browser/src/nsBrowserInstance.cpp
Просмотреть файл

@ -1772,14 +1772,9 @@ nsBrowserAppCore::Reload(nsIWebShell * aPrev, nsLoadFlags aType)
}
NS_IMETHODIMP
nsBrowserAppCore::Add(nsIWebShell * aWebShell)
nsBrowserAppCore::Add(const char * aURL, nsIWebShell * aWebShell)
{
nsresult rv=NS_OK;
if (mSHistory) {
//mSHistory checks for null pointers
rv = mSHistory->Add(aWebShell);
}
return rv;
return NS_OK;
}
NS_IMETHODIMP