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

Re-wrote to avoid use of NS_WITH_SERVICE macro; otherwise, we'll get annoying asserts in viewer.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@32314 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
1999-05-19 07:22:57 +00:00
parent 34cd29be6b
commit 2195264b65
2 changed files with 68 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2257,37 +2257,51 @@ nsWebShell:: GetLinkState(const PRUnichar* aURLSpec, nsLinkState& aState)
static NS_DEFINE_CID(kGlobalHistoryCID, NS_GLOBALHISTORY_CID);
nsresult rv;
NS_WITH_SERVICE(nsIGlobalHistory, history, kGlobalHistoryCID, &rv);
if (NS_SUCCEEDED(rv)) {
// XXX aURLSpec should really be a char*, not a PRUnichar*.
nsAutoString urlStr(aURLSpec);
char buf[256];
char* url = buf;
nsIGlobalHistory* history;
rv = nsServiceManager::GetService(kGlobalHistoryCID,
nsIGlobalHistory::GetIID(),
(nsISupports**) &history);
if (urlStr.Length() >= sizeof(buf)) {
url = new char[urlStr.Length() + 1];
if (! url) return NS_ERROR_OUT_OF_MEMORY;
}
if (NS_FAILED(rv))
return NS_OK; // XXX Okay, we couldn't color the link. Big deal.
// XXX aURLSpec should really be a char*, not a PRUnichar*.
nsAutoString urlStr(aURLSpec);
char buf[256];
char* url = buf;
if (urlStr.Length() >= sizeof(buf)) {
url = new char[urlStr.Length() + 1];
}
PRInt64 lastVisitDate;
if (url) {
urlStr.ToCString(url, urlStr.Length() + 1);
PRInt64 lastVisitDate;
rv = history->GetLastVisitDate(url, &lastVisitDate);
if (url != buf)
delete[] url;
if (NS_FAILED(rv)) return rv;
// a last-visit-date of zero means we've never seen it before; so
// if it's not zero, we must've seen it.
if (! LL_IS_ZERO(lastVisitDate))
aState = eLinkState_Visited;
// XXX how to tell if eLinkState_OutOfDate?
}
else {
rv = NS_ERROR_OUT_OF_MEMORY;
}
nsServiceManager::ReleaseService(kGlobalHistoryCID, history);
if (NS_FAILED(rv)) return rv;
// a last-visit-date of zero means we've never seen it before; so
// if it's not zero, we must've seen it.
if (! LL_IS_ZERO(lastVisitDate))
aState = eLinkState_Visited;
// XXX how to tell if eLinkState_OutOfDate?
return NS_OK;
}