From 0ae18ed7e9cb8810383bd7adf6b3ab0fc545b32a Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Wed, 2 Nov 2005 07:38:52 +0000 Subject: [PATCH] landing attempt #2 for 195262 - support for static atoms, and converting atoms over to UTF8 to reduce bloat - now without performance regressions! sr=darin, r=dbaron git-svn-id: svn://10.0.0.236/trunk@183694 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/xslt/src/base/txStringUtils.h | 4 +--- mozilla/content/xslt/src/xpath/txNameTest.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/mozilla/content/xslt/src/base/txStringUtils.h b/mozilla/content/xslt/src/base/txStringUtils.h index 5602174ca5b..1c8ba37f79d 100644 --- a/mozilla/content/xslt/src/base/txStringUtils.h +++ b/mozilla/content/xslt/src/base/txStringUtils.h @@ -73,9 +73,7 @@ void TX_ToLowerCase(const nsAString& aSource, nsAString& aDest); */ static PRBool TX_StringEqualsAtom(const nsAString& aString, nsIAtom* aAtom) { - const PRUnichar* atom; - aAtom->GetUnicode(&atom); - return aString.Equals(atom); + return aAtom->Equals(aString); }; #endif // txStringUtils_h__ diff --git a/mozilla/content/xslt/src/xpath/txNameTest.cpp b/mozilla/content/xslt/src/xpath/txNameTest.cpp index 7b63a478a4c..bff91f825b3 100644 --- a/mozilla/content/xslt/src/xpath/txNameTest.cpp +++ b/mozilla/content/xslt/src/xpath/txNameTest.cpp @@ -88,12 +88,12 @@ double txNameTest::getDefaultPriority() void txNameTest::toString(nsAString& aDest) { if (mPrefix) { - const PRUnichar* prefix; - mPrefix->GetUnicode(&prefix); - aDest.Append(nsDependentString(prefix)); + nsAutoString prefix; + mPrefix->ToString(prefix); + aDest.Append(prefix); aDest.Append(PRUnichar(':')); } - const PRUnichar* localName; - mLocalName->GetUnicode(&localName); - aDest.Append(nsDependentString(localName)); + nsAutoString localName; + mLocalName->ToString(localName); + aDest.Append(localName); }