Testing performance impact of backout of part of patch from bug 115289.

See bug 123947 for details. a=mcafee
This commit is contained in:
bzbarsky%mit.edu 2002-02-09 19:00:56 +00:00
parent 7fbffdf125
commit 228f6acb38
4 changed files with 13 additions and 18 deletions

View File

@ -1462,10 +1462,10 @@ nsObjectFrame::IsHidden() const
// not to hide the <embed> once you'd put the 'hidden' attribute
// on the tag...
// these |NS_ConvertASCIItoUCS2|s can't be |NS_LITERAL_STRING|s until |EqualsIgnoreCase| get's fixed
if (!hidden.IsEmpty() &&
!hidden.Equals(NS_LITERAL_STRING("false"), nsCaseInsensitiveStringComparator()) &&
!hidden.Equals(NS_LITERAL_STRING("no"), nsCaseInsensitiveStringComparator()) &&
!hidden.Equals(NS_LITERAL_STRING("off"), nsCaseInsensitiveStringComparator())) {
if (hidden.Length() &&
(Compare(hidden, NS_LITERAL_STRING("false"), nsCaseInsensitiveStringComparator()) != 0) &&
(Compare(hidden, NS_LITERAL_STRING("no"), nsCaseInsensitiveStringComparator()) != 0) &&
(Compare(hidden, NS_LITERAL_STRING("off"), nsCaseInsensitiveStringComparator()) != 0)) {
// The <embed> or <applet> is hidden.
return PR_TRUE;
}

View File

@ -1462,10 +1462,10 @@ nsObjectFrame::IsHidden() const
// not to hide the <embed> once you'd put the 'hidden' attribute
// on the tag...
// these |NS_ConvertASCIItoUCS2|s can't be |NS_LITERAL_STRING|s until |EqualsIgnoreCase| get's fixed
if (!hidden.IsEmpty() &&
!hidden.Equals(NS_LITERAL_STRING("false"), nsCaseInsensitiveStringComparator()) &&
!hidden.Equals(NS_LITERAL_STRING("no"), nsCaseInsensitiveStringComparator()) &&
!hidden.Equals(NS_LITERAL_STRING("off"), nsCaseInsensitiveStringComparator())) {
if (hidden.Length() &&
(Compare(hidden, NS_LITERAL_STRING("false"), nsCaseInsensitiveStringComparator()) != 0) &&
(Compare(hidden, NS_LITERAL_STRING("no"), nsCaseInsensitiveStringComparator()) != 0) &&
(Compare(hidden, NS_LITERAL_STRING("off"), nsCaseInsensitiveStringComparator()) != 0)) {
// The <embed> or <applet> is hidden.
return PR_TRUE;
}

View File

@ -266,8 +266,7 @@ nsMenuBarFrame::FindMenuWithShortcut(PRUint32 aLetter)
if (!shortcutKey.IsEmpty()) {
// We've got something.
PRUnichar letter = PRUnichar(aLetter); // throw away the high-zero-fill
if ( shortcutKey.Equals(Substring(&letter, &letter+1),
nsCaseInsensitiveStringComparator()) ) {
if ( Compare(shortcutKey, Substring(&letter, &letter+1), nsCaseInsensitiveStringComparator())==0 ) {
// We match!
nsCOMPtr<nsIMenuFrame> menuFrame = do_QueryInterface(currFrame);
if (menuFrame)

View File

@ -723,8 +723,7 @@ nsJAR::ParseOneFile(nsISignatureVerifier* verifier,
//-- Lines to look for:
// (1) Digest:
if (lineName.Equals(NS_LITERAL_CSTRING("SHA1-Digest"),
nsCaseInsensitiveCStringComparator()))
if (Compare(lineName, NS_LITERAL_CSTRING("SHA1-Digest"), nsCaseInsensitiveCStringComparator()) == 0)
//-- This is a digest line, save the data in the appropriate place
{
if(aFileType == JAR_MF)
@ -740,8 +739,7 @@ nsJAR::ParseOneFile(nsISignatureVerifier* verifier,
}
// (2) Name: associates this manifest section with a file in the jar.
if (!foundName && lineName.Equals(NS_LITERAL_CSTRING("Name"),
nsCaseInsensitiveCStringComparator()))
if (!foundName && Compare(lineName, NS_LITERAL_CSTRING("Name"), nsCaseInsensitiveCStringComparator()) == 0)
{
curItemName = lineData;
foundName = PR_TRUE;
@ -751,11 +749,9 @@ nsJAR::ParseOneFile(nsISignatureVerifier* verifier,
// (3) Magic: this may be an inline Javascript.
// We can't do any other kind of magic.
if ( aFileType == JAR_MF &&
lineName.Equals(NS_LITERAL_CSTRING("Magic"),
nsCaseInsensitiveCStringComparator()))
Compare(lineName, NS_LITERAL_CSTRING("Magic"), nsCaseInsensitiveCStringComparator()) == 0)
{
if(lineData.Equals(NS_LITERAL_CSTRING("javascript"),
nsCaseInsensitiveCStringComparator()))
if(Compare(lineData, NS_LITERAL_CSTRING("javascript"), nsCaseInsensitiveCStringComparator()) == 0)
curItemMF->mType = JAR_EXTERNAL;
else
curItemMF->mType = JAR_INVALID;