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

Reduce string copying from nsGenericHTMLElement::GetHrefURIForAnchors (bug 267506). r+sr=jst.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@164872 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com 2004-11-03 19:44:59 +00:00
parent dad99a0cc9
commit b17a54f274
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/content/base/src/nsContentUtils.cpp
View File

@ -1538,11 +1538,8 @@ nsContentUtils::NewURIWithDocumentCharset(nsIURI** aResult,
nsIDocument* aDocument,
nsIURI* aBaseURI)
{
nsCAutoString originCharset;
if (aDocument)
originCharset = aDocument->GetDocumentCharacterSet();
return NS_NewURI(aResult, NS_ConvertUCS2toUTF8(aSpec), originCharset.get(),
return NS_NewURI(aResult, aSpec,
aDocument ? aDocument->GetDocumentCharacterSet().get() : nsnull,
aBaseURI, sIOService);
}

8
mozilla/content/html/content/src/nsGenericHTMLElement.cpp
View File

@ -1583,16 +1583,16 @@ nsGenericHTMLElement::GetHrefURIForAnchors(nsIURI** aURI)
// nsHTMLStyleElement.
// Get href= attribute (relative URI).
nsAutoString relURISpec;
if (NS_CONTENT_ATTR_HAS_VALUE ==
GetAttr(kNameSpaceID_None, nsHTMLAtoms::href, relURISpec)) {
// We use the nsAttrValue's copy of the URI string to avoid copying.
const nsAttrValue* attr = mAttrsAndChildren.GetAttr(nsHTMLAtoms::href);
if (attr) {
// Get base URI.
nsCOMPtr<nsIURI> baseURI = GetBaseURI();
// Get absolute URI.
nsresult rv = nsContentUtils::NewURIWithDocumentCharset(aURI,
relURISpec,
attr->GetStringValue(),
GetOwnerDoc(),
baseURI);
if (NS_FAILED(rv)) {