Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't fire onLocationChange for initial loads in subframes; reverts old

Browse Source 
behavior.  Bug 285738, patch by William A. Gianopoulos
<wgianopoulos@yahoo.com>, r=jst, sr=bzbarsky


git-svn-id: svn://10.0.0.236/trunk@171363 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2005-03-30 04:22:00 +00:00
parent 3d75b80be5
commit b7f2b5b8a5
2 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -1336,14 +1336,14 @@ nsDocShell::SetCurrentURI(nsIURI *aURI)
return NS_OK;
}
void
PRBool
nsDocShell::SetCurrentURI(nsIURI *aURI, nsIRequest *aRequest,
PRBool aFireOnLocationChange)
{
// We don't want to send a location change when we're displaying an error
// page, and we don't want to change our idea of "current URI" either
if (mLoadType == LOAD_ERROR_PAGE) {
return;
return PR_FALSE;
}
mCurrentURI = aURI; //This assignment addrefs
@@ -1373,12 +1373,13 @@ nsDocShell::SetCurrentURI(nsIURI *aURI, nsIRequest *aRequest,
* a subframe is being loaded for the first time, while
* visiting a frameset page
*/
return;
return PR_FALSE;
}
if (aFireOnLocationChange) {
FireOnLocationChange(this, aRequest, aURI);
}
return !aFireOnLocationChange;
}
NS_IMETHODIMP
@@ -4749,7 +4750,7 @@ nsDocShell::CreateContentViewer(const char *aContentType,
nsCOMPtr<nsIChannel> aOpenedChannel = do_QueryInterface(request);
OnLoadingSite(aOpenedChannel, PR_FALSE);
PRBool onLocationChangeNeeded = OnLoadingSite(aOpenedChannel, PR_FALSE);
// let's try resetting the load group if we need to...
nsCOMPtr<nsILoadGroup> currentLoadGroup;
@@ -4820,7 +4821,9 @@ nsDocShell::CreateContentViewer(const char *aContentType,
PL_FavorPerformanceHint(PR_TRUE, NS_EVENT_STARVATION_DELAY_HINT);
}
FireOnLocationChange(this, request, mCurrentURI);
if (onLocationChangeNeeded) {
FireOnLocationChange(this, request, mCurrentURI);
}
return NS_OK;
}
@@ -6221,7 +6224,7 @@ nsDocShell::ScrollIfAnchor(nsIURI * aURI, PRBool * aWasAnchor,
}
void
PRBool
nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel,
PRUint32 aLoadType, PRBool aFireOnLocationChange)
{
@@ -6354,13 +6357,15 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel,
if (shInternal)
shInternal->UpdateIndex();
}
SetCurrentURI(aURI, aChannel, aFireOnLocationChange);
PRBool onLocationChangeNeeded = SetCurrentURI(aURI, aChannel,
aFireOnLocationChange);
// if there's a refresh header in the channel, this method
// will set it up for us.
SetupRefreshURI(aChannel);
return onLocationChangeNeeded;
}
nsresult
PRBool
nsDocShell::OnLoadingSite(nsIChannel * aChannel, PRBool aFireOnLocationChange)
{
nsCOMPtr<nsIURI> uri;
@@ -6376,11 +6381,10 @@ nsDocShell::OnLoadingSite(nsIChannel * aChannel, PRBool aFireOnLocationChange)
aChannel->GetURI(getter_AddRefs(uri));
else
aChannel->GetOriginalURI(getter_AddRefs(uri));
NS_ENSURE_TRUE(uri, NS_ERROR_FAILURE);
NS_ENSURE_TRUE(uri, PR_FALSE);
OnNewURI(uri, aChannel, mLoadType, aFireOnLocationChange);
return OnNewURI(uri, aChannel, mLoadType, aFireOnLocationChange);
return NS_OK;
}
void