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

currentURI property removed from nsIDocShell. currentURI property changed to return nsIURI on nsIWebNavigation. b=46847, r=valeski, a=valeski

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@77611 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
locka%iol.ie
2000-08-30 11:32:30 +00:00
parent 188fb97dc5
commit 3173294e22
3 changed files with 8 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,16 +359,6 @@ NS_IMETHODIMP nsDocShell::StopLoad()
}
NS_IMETHODIMP nsDocShell::GetCurrentURI(nsIURI** aURI)
{
NS_ENSURE_ARG_POINTER(aURI);
*aURI = mCurrentURI;
NS_IF_ADDREF(*aURI);
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetDocLoaderObserver(nsIDocumentLoaderObserver * *aDocLoaderObserver)
{
@@ -1468,24 +1458,13 @@ NS_IMETHODIMP nsDocShell::GetDocument(nsIDOMDocument** aDocument)
return mContentViewer->GetDOMDocument(aDocument);
}
NS_IMETHODIMP nsDocShell::GetCurrentURI(PRUnichar** aCurrentURI)
NS_IMETHODIMP nsDocShell::GetCurrentURI(nsIURI** aURI)
{
NS_ENSURE_ARG_POINTER(aCurrentURI);
NS_ENSURE_ARG_POINTER(aURI);
if(!mCurrentURI)
{
*aCurrentURI = nsnull;
return NS_OK;
}
char* spec;
NS_ENSURE_SUCCESS(mCurrentURI->GetSpec(&spec), NS_ERROR_FAILURE);
*aCurrentURI = NS_ConvertASCIItoUCS2(spec).ToNewUnicode();
if(spec)
nsCRT::free(spec);
*aURI = mCurrentURI;
NS_IF_ADDREF(*aURI);
return NS_OK;
}