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

Back out changes my changes to nsILinkHandler because of performance problems.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@66246 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
2000-04-18 04:34:20 +00:00
parent 1af7c28b13
commit 9730aa1e21
9 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/content/html/style/src/nsCSSStyleSheet.cpp
View File

@@ -2741,8 +2741,8 @@ static PRBool SelectorMatches(nsIPresContext* aPresContext,
}
}
nsCOMPtr<nsIURI> linkURI;
(void) NS_NewURI(getter_AddRefs(linkURI), href, baseURI, CSSStyleSheetInner::gIOService);
nsAutoString linkURI;
(void) NS_MakeAbsoluteURI(linkURI, href, baseURI, CSSStyleSheetInner::gIOService);
linkHandler->GetLinkState(linkURI, linkState);
}

4
mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
View File

@@ -864,8 +864,8 @@ HTMLStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
nsCOMPtr<nsIURI> baseURI;
htmlContent->GetBaseURL(*getter_AddRefs(baseURI));
nsCOMPtr<nsIURI> linkURI;
(void) NS_NewURI(getter_AddRefs(linkURI), href, baseURI);
nsAutoString linkURI;
(void) NS_MakeAbsoluteURI(linkURI, href, baseURI);
nsLinkState state;
if (NS_OK == linkHandler->GetLinkState(linkURI, state)) {

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

@@ -258,7 +258,7 @@ public:
NS_IMETHOD OnOverLink(nsIContent* aContent,
const PRUnichar* aURLSpec,
const PRUnichar* aTargetSpec);
NS_IMETHOD GetLinkState(nsIURI* aLinkURI, nsLinkState& aState);
NS_IMETHOD GetLinkState(const nsString& aLinkURI, nsLinkState& aState);
// nsIProgressEventSink
NS_DECL_NSIPROGRESSEVENTSINK
@@ -1409,12 +1409,8 @@ nsWebShell::OnOverLink(nsIContent* aContent,
}
NS_IMETHODIMP
nsWebShell::GetLinkState(nsIURI* aLinkURI, nsLinkState& aState)
nsWebShell::GetLinkState(const nsString& aLinkURI, nsLinkState& aState)
{
NS_PRECONDITION(aLinkURI != nsnull, "null ptr");
if (! aLinkURI)
return NS_ERROR_NULL_POINTER;
aState = eLinkState_Unvisited;
nsresult rv;
@@ -1422,11 +1418,11 @@ nsWebShell::GetLinkState(nsIURI* aLinkURI, nsLinkState& aState)
EnsureGlobalHistory();
if (mGlobalHistory) {
nsXPIDLCString url;
aLinkURI->GetSpec(getter_Copies(url));
nsCAutoString url;
url.AssignWithConversion(aLinkURI.GetUnicode());
PRInt64 lastVisitDate;
rv = mGlobalHistory->GetLastVisitDate(url, &lastVisitDate);
rv = mGlobalHistory->GetLastVisitDate(url.GetBuffer(), &lastVisitDate);
if (NS_FAILED(rv)) return rv;
// a last-visit-date of zero means we've never seen it before; so

4
mozilla/layout/html/style/src/nsCSSStyleSheet.cpp
View File

@@ -2741,8 +2741,8 @@ static PRBool SelectorMatches(nsIPresContext* aPresContext,
}
}
nsCOMPtr<nsIURI> linkURI;
(void) NS_NewURI(getter_AddRefs(linkURI), href, baseURI, CSSStyleSheetInner::gIOService);
nsAutoString linkURI;
(void) NS_MakeAbsoluteURI(linkURI, href, baseURI, CSSStyleSheetInner::gIOService);
linkHandler->GetLinkState(linkURI, linkState);
}

4
mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
View File

@@ -864,8 +864,8 @@ HTMLStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
nsCOMPtr<nsIURI> baseURI;
htmlContent->GetBaseURL(*getter_AddRefs(baseURI));
nsCOMPtr<nsIURI> linkURI;
(void) NS_NewURI(getter_AddRefs(linkURI), href, baseURI);
nsAutoString linkURI;
(void) NS_MakeAbsoluteURI(linkURI, href, baseURI);
nsLinkState state;
if (NS_OK == linkHandler->GetLinkState(linkURI, state)) {

4
mozilla/layout/style/nsCSSStyleSheet.cpp
View File

@@ -2741,8 +2741,8 @@ static PRBool SelectorMatches(nsIPresContext* aPresContext,
}
}
nsCOMPtr<nsIURI> linkURI;
(void) NS_NewURI(getter_AddRefs(linkURI), href, baseURI, CSSStyleSheetInner::gIOService);
nsAutoString linkURI;
(void) NS_MakeAbsoluteURI(linkURI, href, baseURI, CSSStyleSheetInner::gIOService);
linkHandler->GetLinkState(linkURI, linkState);
}

4
mozilla/layout/style/nsHTMLStyleSheet.cpp
View File

@@ -864,8 +864,8 @@ HTMLStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
nsCOMPtr<nsIURI> baseURI;
htmlContent->GetBaseURL(*getter_AddRefs(baseURI));
nsCOMPtr<nsIURI> linkURI;
(void) NS_NewURI(getter_AddRefs(linkURI), href, baseURI);
nsAutoString linkURI;
(void) NS_MakeAbsoluteURI(linkURI, href, baseURI);
nsLinkState state;
if (NS_OK == linkHandler->GetLinkState(linkURI, state)) {

4
mozilla/webshell/public/nsILinkHandler.h
View File

@@ -27,7 +27,7 @@
class nsIInputStream;
class nsIContent;
class nsIURI;
class nsString;
struct nsGUIEvent;
// Interface ID for nsILinkHandler
@@ -83,7 +83,7 @@ public:
/**
* Get the state of a link to a given absolute URL
*/
NS_IMETHOD GetLinkState(nsIURI* aLinkURI, nsLinkState& aState) = 0;
NS_IMETHOD GetLinkState(const nsString& aLinkURI, nsLinkState& aState) = 0;
};
#endif /* nsILinkHandler_h___ */

14
mozilla/webshell/src/nsWebShell.cpp
View File

@@ -258,7 +258,7 @@ public:
NS_IMETHOD OnOverLink(nsIContent* aContent,
const PRUnichar* aURLSpec,
const PRUnichar* aTargetSpec);
NS_IMETHOD GetLinkState(nsIURI* aLinkURI, nsLinkState& aState);
NS_IMETHOD GetLinkState(const nsString& aLinkURI, nsLinkState& aState);
// nsIProgressEventSink
NS_DECL_NSIPROGRESSEVENTSINK
@@ -1409,12 +1409,8 @@ nsWebShell::OnOverLink(nsIContent* aContent,
}
NS_IMETHODIMP
nsWebShell::GetLinkState(nsIURI* aLinkURI, nsLinkState& aState)
nsWebShell::GetLinkState(const nsString& aLinkURI, nsLinkState& aState)
{
NS_PRECONDITION(aLinkURI != nsnull, "null ptr");
if (! aLinkURI)
return NS_ERROR_NULL_POINTER;
aState = eLinkState_Unvisited;
nsresult rv;
@@ -1422,11 +1418,11 @@ nsWebShell::GetLinkState(nsIURI* aLinkURI, nsLinkState& aState)
EnsureGlobalHistory();
if (mGlobalHistory) {
nsXPIDLCString url;
aLinkURI->GetSpec(getter_Copies(url));
nsCAutoString url;
url.AssignWithConversion(aLinkURI.GetUnicode());
PRInt64 lastVisitDate;
rv = mGlobalHistory->GetLastVisitDate(url, &lastVisitDate);
rv = mGlobalHistory->GetLastVisitDate(url.GetBuffer(), &lastVisitDate);
if (NS_FAILED(rv)) return rv;
// a last-visit-date of zero means we've never seen it before; so