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

Bug 12493. Change nsILinkHandler interface to take an nsIURI object instead of a string. This allows necko to canonify URIs before passing them back to global history. r=travis,pierre

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@65837 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
2000-04-13 19:55:47 +00:00
parent 6d14b4f30d
commit 76b91f9af2
10 changed files with 90 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -274,7 +274,7 @@ public:
NS_IMETHOD OnOverLink(nsIContent* aContent,
const PRUnichar* aURLSpec,
const PRUnichar* aTargetSpec);
NS_IMETHOD GetLinkState(const PRUnichar* aURLSpec, nsLinkState& aState);
NS_IMETHOD GetLinkState(nsIURI* aLinkURI, nsLinkState& aState);
// nsIProgressEventSink
NS_DECL_NSIPROGRESSEVENTSINK
@@ -1781,8 +1781,12 @@ nsWebShell::OnOverLink(nsIContent* aContent,
}
NS_IMETHODIMP
nsWebShell::GetLinkState(const PRUnichar* aURLSpec, nsLinkState& aState)
nsWebShell::GetLinkState(nsIURI* aLinkURI, nsLinkState& aState)
{
NS_PRECONDITION(aLinkURI != nsnull, "null ptr");
if (! aLinkURI)
return NS_ERROR_NULL_POINTER;
aState = eLinkState_Unvisited;
nsresult rv;
@@ -1800,31 +1804,11 @@ nsWebShell::GetLinkState(const PRUnichar* aURLSpec, nsLinkState& aState)
if (mHistoryService) {
// XXX aURLSpec should really be a char*, not a PRUnichar*.
nsAutoString urlStr(aURLSpec);
char buf[256];
char* url = buf;
if (urlStr.Length() >= PRInt32(sizeof buf)) {
url = new char[urlStr.Length() + 1];
}
nsXPIDLCString url;
aLinkURI->GetSpec(getter_Copies(url));
PRInt64 lastVisitDate;
if (url) {
urlStr.ToCString(url, urlStr.Length() + 1);
rv = mHistoryService->GetLastVisitDate(url, &lastVisitDate);
if (url != buf)
delete[] url;
}
else {
rv = NS_ERROR_OUT_OF_MEMORY;
}
//XXX: Moved to destructor nsServiceManager::ReleaseService(kGlobalHistoryCID, mHistoryService);
rv = mHistoryService->GetLastVisitDate(url, &lastVisitDate);
if (NS_FAILED(rv)) return rv;
// a last-visit-date of zero means we've never seen it before; so