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

bug #85271: sr=waterson, r={beard, jag, dbaron}, a=asa. Eliminate features of |nsXPIDLC?String| that keep it out of the string hierarchy (i.e., using assigment to rebind ownership, static |Copy| members, and |getter_Shares|), fixing some leaks in the process.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@97289 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scc%mozilla.org
2001-06-17 05:23:38 +00:00
parent 39c092ec2e
commit 90f810b66a
77 changed files with 333 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/content/base/src/nsHTMLContentSerializer.cpp
View File

@@ -179,7 +179,7 @@ nsHTMLContentSerializer::EscapeURI(const nsAReadableString& aURI, nsAWritableStr
if (mCharSet && !uri.IsASCII()) {
const PRUnichar *charset;
mCharSet->GetUnicode(&charset);
documentCharset = NS_ConvertUCS2toUTF8(charset).get();
documentCharset.Adopt(ToNewUTF8String(nsDependentString(charset)));
textToSubURI = do_GetService(NS_ITEXTTOSUBURI_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
}
@@ -198,7 +198,7 @@ nsHTMLContentSerializer::EscapeURI(const nsAReadableString& aURI, nsAWritableStr
NS_ENSURE_SUCCESS(rv, rv);
}
else {
escapedURI = nsEscape(NS_ConvertUCS2toUTF8(part).get(), url_Path);
escapedURI.Adopt(nsEscape(NS_ConvertUCS2toUTF8(part).get(), url_Path));
}
aEscapedURI.Append(NS_ConvertASCIItoUCS2(escapedURI));
@@ -216,7 +216,7 @@ nsHTMLContentSerializer::EscapeURI(const nsAReadableString& aURI, nsAWritableStr
NS_ENSURE_SUCCESS(rv, rv);
}
else {
escapedURI = nsEscape(NS_ConvertUCS2toUTF8(part).get(), url_Path);
escapedURI.Adopt(nsEscape(NS_ConvertUCS2toUTF8(part).get(), url_Path));
}
aEscapedURI.Append(NS_ConvertASCIItoUCS2(escapedURI));
}
@@ -244,8 +244,8 @@ nsHTMLContentSerializer::SerializeAttributes(nsIContent* aContent,
*getter_AddRefs(attrPrefix));
// Filter out any attribute starting with _moz
nsXPIDLString sharedName;
attrName->GetUnicode(getter_Shares(sharedName));
const PRUnichar* sharedName;
attrName->GetUnicode(&sharedName);
if (nsCRT::strncmp(sharedName,
NS_ConvertASCIItoUCS2(kMozStr).get(),
sizeof(kMozStr)-1) == 0) {
@@ -334,8 +334,8 @@ nsHTMLContentSerializer::AppendElementStart(nsIDOMElement *aElement,
AppendToString(kLessThan, aStr);
nsXPIDLString sharedName;
name->GetUnicode(getter_Shares(sharedName));
const PRUnichar* sharedName;
name->GetUnicode(&sharedName);
AppendToString(sharedName, -1, aStr);
SerializeAttributes(content, name, aStr);
@@ -376,8 +376,8 @@ nsHTMLContentSerializer::AppendElementEnd(nsIDOMElement *aElement,
mPreLevel--;
}
nsXPIDLString sharedName;
name->GetUnicode(getter_Shares(sharedName));
const PRUnichar* sharedName;
name->GetUnicode(&sharedName);
nsCOMPtr<nsIParserService> parserService;
GetParserService(getter_AddRefs(parserService));