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

Fix 29541

Browse Source 
r=travis,a=jar


git-svn-id: svn://10.0.0.236/trunk@62166 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
norris%netscape.com
2000-03-03 22:55:40 +00:00
parent c02c79555f
commit d9654e0eb0
3 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/docshell/base/nsWebShell.cpp
View File

@@ -347,6 +347,7 @@ public:
// nsIDocShell
NS_DECL_NSIDOCSHELL
void SetCurrentURI(nsIURI* aURI);
// nsWebShell
nsIEventQueue* GetEventQueue(void);
@@ -1163,10 +1164,24 @@ nsWebShell::GetURL(const PRUnichar** aURL)
NS_IMETHODIMP
nsWebShell::SetURL(const PRUnichar* aURL)
{
mURL = aURL;
nsCOMPtr<nsIURI> uri;
NS_ENSURE_SUCCESS(NS_NewURI(getter_AddRefs(uri), aURL, nsnull),
NS_ERROR_FAILURE);
SetCurrentURI(uri);
return NS_OK;
}
void
nsWebShell::SetCurrentURI(nsIURI* aURI)
{
nsXPIDLCString spec;
if (NS_SUCCEEDED(aURI->GetSpec(getter_Copies(spec)))) {
mURL = spec;
nsDocShell::SetCurrentURI(aURI);
}
}
NS_IMETHODIMP
nsWebShell::GetIsInSHist(PRBool& aResult)
{