diff --git a/mozilla/string/obsolete/bufferRoutines.h b/mozilla/string/obsolete/bufferRoutines.h
index b41fa7f74b1..81bd1cc17e1 100644
--- a/mozilla/string/obsolete/bufferRoutines.h
+++ b/mozilla/string/obsolete/bufferRoutines.h
@@ -706,7 +706,6 @@ inline PRInt32 RFindChar2(const char* aDest,PRUint32 aDestLength,PRInt32 anOffse
 
 typedef PRInt32 (*FindChars)(const char* aDest,PRUint32 aDestLength,PRInt32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase,PRInt32 aCount);
 FindChars gFindChars[]={&FindChar1,&FindChar2};
-FindChars gRFindChars[]={&RFindChar1,&RFindChar2};
 
 //----------------------------------------------------------------------------------------
 //
diff --git a/mozilla/string/obsolete/nsStr.cpp b/mozilla/string/obsolete/nsStr.cpp
index fbdbddc4b5b..4d2586b8131 100644
--- a/mozilla/string/obsolete/nsStr.cpp
+++ b/mozilla/string/obsolete/nsStr.cpp
@@ -565,8 +565,13 @@ PRInt32 nsStr::RFindSubstr(const nsStr& aDest,const nsStr& aTarget,PRBool aIgnor
  *  @param   aCount tell us how many iterations to perform from offset; -1 means use full length.
  *  @return  index in aDest where member of aSet occurs, or -1 if not found
  */
-PRInt32 nsStr::RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) {
-  return gRFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,anOffset,aChar,aIgnoreCase,aCount);
+PRInt32 nsStr::RFindChar1(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) {
+  NS_ASSERTION(aDest.mCharSize == eOneByte, "Must be 1 bytes");
+  return ::RFindChar1(aDest.mStr,aDest.mLength,anOffset,aChar,aIgnoreCase,aCount);
+}
+PRInt32 nsStr::RFindChar2(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) {
+  NS_ASSERTION(aDest.mCharSize == eTwoByte, "Must be 2 bytes");
+  return ::RFindChar2(aDest.mStr,aDest.mLength,anOffset,aChar,aIgnoreCase,aCount);
 }
 
 
@@ -599,6 +604,44 @@ PRInt32 nsStr::RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnor
   return kNotFound;
 }
 
+// from the start of the old nsStr::StrCompare - now used as helper
+// routines for nsStr::Compare1to1 and so forth
+static inline PRInt32
+GetCompareCount(const PRInt32 aDestLength, const PRInt32 aSourceLength,
+                PRInt32 aCount)
+{
+  PRInt32 minlen=(aSourceLength<aDestLength) ? aSourceLength : aDestLength;
+
+  if(0==minlen) {
+    if ((aDestLength == 0) && (aSourceLength == 0))
+      return 0;
+    if (aDestLength == 0)
+      return -1;
+    return 1;
+  }
+
+  PRInt32 theCount = (aCount<0) ? minlen: MinInt(aCount,minlen);
+    
+  return theCount;
+}
+
+static inline PRInt32
+TranslateCompareResult(const PRInt32 aDestLength, const PRInt32& aSourceLength, PRInt32 result, PRInt32 aCount)
+{
+
+  if (0==result && -1==aCount) {
+    //Since the caller didn't give us a length to test, and minlen characters matched,
+    //we have to assume that the longer string is greater.
+      
+    if (aDestLength != aSourceLength) {
+      //we think they match, but we've only compared minlen characters. 
+      //if the string lengths are different, then they don't really match.
+      result = (aDestLength<aSourceLength) ? -1 : 1;
+    }
+  }
+  
+  return result;
+}
 /**
  * Compare source and dest strings, up to an (optional max) number of chars
  * @param   aDest is the first str to compare
@@ -607,39 +650,59 @@ PRInt32 nsStr::RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnor
  * @param   aIgnorecase tells us whether to search with case sensitivity
  * @return  aDest<aSource=-1;aDest==aSource==0;aDest>aSource=1
  */
-PRInt32 nsStr::StrCompare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
-  PRInt32 result=0;
-
-  if(aCount) {
-    PRInt32 minlen=(aSource.mLength<aDest.mLength) ? aSource.mLength : aDest.mLength;
-
-    if(0==minlen) {
-      if ((aDest.mLength == 0) && (aSource.mLength == 0))
-        return 0;
-      if (aDest.mLength == 0)
-        return -1;
-      return 1;
-    }
-
-    PRInt32 theCount = (aCount<0) ? minlen: MinInt(aCount,minlen);
-    result=(*gCompare[aDest.mCharSize][aSource.mCharSize])(aDest.mStr,aSource.mStr,theCount,aIgnoreCase);
-
-    if (0==result) {
-      if(-1==aCount) {
-
-          //Since the caller didn't give us a length to test, and minlen characters matched,
-          //we have to assume that the longer string is greater.
-
-        if (aDest.mLength != aSource.mLength) {
-          //we think they match, but we've only compared minlen characters. 
-          //if the string lengths are different, then they don't really match.
-          result = (aDest.mLength<aSource.mLength) ? -1 : 1;
-        }
-      } //if
-    }
-
+PRInt32 nsStr::StrCompare1To1(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
+  NS_ASSERTION(aDest.mCharSize == eOneByte, "Must be 1 byte");
+  NS_ASSERTION(aSource.mCharSize == eOneByte, "Must be 1 byte");
+  if (aCount) {
+    PRInt32 theCount = GetCompareCount(aDest.mLength, aSource.mLength, aCount);
+    PRInt32 result = Compare1To1(aDest.mStr, aSource.mStr, theCount, aIgnoreCase);
+    result = TranslateCompareResult(aDest.mLength, aSource.mLength, result, aCount);
+    return result;
   }
-  return result;
+  
+  return 0;
+}
+
+PRInt32 nsStr::StrCompare1To2(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
+  
+  NS_ASSERTION(aDest.mCharSize == eOneByte, "Must be 1 byte");
+  NS_ASSERTION(aSource.mCharSize == eTwoByte, "Must be 2 byte");
+  if (aCount) {
+    PRInt32 theCount = GetCompareCount(aDest.mLength, aSource.mLength, aCount);
+    PRInt32 result = Compare1To2(aDest.mStr, aSource.mStr, theCount, aIgnoreCase);
+    result = TranslateCompareResult(aDest.mLength, aSource.mLength, result, aCount);
+    return result;
+  }
+  
+  return 0;
+}
+
+PRInt32 nsStr::StrCompare2To1(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
+  NS_ASSERTION(aDest.mCharSize == eTwoByte, "Must be 2 byte");
+  NS_ASSERTION(aSource.mCharSize == eOneByte, "Must be 1 byte");
+  
+  if (aCount) {
+    PRInt32 theCount = GetCompareCount(aDest.mLength, aSource.mLength, aCount);
+    PRInt32 result = Compare2To1(aDest.mStr, aSource.mStr, theCount, aIgnoreCase);
+    result = TranslateCompareResult(aDest.mLength, aSource.mLength, result, aCount);
+    return result;
+  }
+  
+  return 0;
+}
+
+PRInt32 nsStr::StrCompare2To2(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
+  NS_ASSERTION(aDest.mCharSize == eTwoByte, "Must be 2 byte");
+  NS_ASSERTION(aSource.mCharSize == eTwoByte, "Must be 2 byte");
+  
+  if (aCount) {
+    PRInt32 theCount = GetCompareCount(aDest.mLength, aSource.mLength, aCount);
+    PRInt32 result = Compare2To2(aDest.mStr, aSource.mStr, theCount, aIgnoreCase);
+    result = TranslateCompareResult(aDest.mLength, aSource.mLength, result, aCount);
+    return result;
+  }
+  
+  return 0;
 }
 
 /**
@@ -851,14 +914,6 @@ nsStr_Hash(const void* key)
   return nsStr::HashCode(*str);
 }
 
-PR_EXTERN(PRIntn)
-nsStr_Compare(const void *v1, const void *v2)
-{
-  nsStr* str1 = (nsStr*)v1;
-  nsStr* str2 = (nsStr*)v2;
-  return nsStr::StrCompare(*str1, *str2, -1, PR_FALSE) == 0;
-}
-
 nsStringInfo*
 nsStringInfo::GetInfo(nsStr& str)
 {
diff --git a/mozilla/string/obsolete/nsStr.h b/mozilla/string/obsolete/nsStr.h
index 0a3e8c60544..322097684c9 100644
--- a/mozilla/string/obsolete/nsStr.h
+++ b/mozilla/string/obsolete/nsStr.h
@@ -405,7 +405,14 @@ struct NS_COM nsStr {
    * @param   aIgnorecase tells us whether to use a case-sensitive comparison
    * @return  -1,0,1 depending on <,==,>
    */
-  static PRInt32  StrCompare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase);
+  static PRInt32 StrCompare1To1(const nsStr& aDest,const nsStr& aSource,
+                                PRInt32 aCount,PRBool aIgnoreCase);
+  static PRInt32 StrCompare1To2(const nsStr& aDest, const nsStr& aSource,
+                                PRInt32 aCount, PRBool aIgnoreCase);
+  static PRInt32 StrCompare2To1(const nsStr& aDest, const nsStr& aSource,
+                                PRInt32 aCount, PRBool aIgnoreCase);
+  static PRInt32 StrCompare2To2(const nsStr& aDest, const nsStr& aSource,
+                                PRInt32 aCount, PRBool aIgnoreCase);
 
  /**
   * These methods scan the given string for 1 or more chars in a given direction
@@ -422,7 +429,8 @@ struct NS_COM nsStr {
   static PRInt32 FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
 
   static PRInt32 RFindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount);
-  static PRInt32 RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount);
+  static PRInt32 RFindChar1(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount);
+  static PRInt32 RFindChar2(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount);
   static PRInt32 RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
 
   static void    Overwrite(nsStr& aDest,const nsStr& aSource,PRInt32 anOffset);
diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp
index 355f8a764c7..7876e542a15 100644
--- a/mozilla/string/obsolete/nsString.cpp
+++ b/mozilla/string/obsolete/nsString.cpp
@@ -1053,7 +1053,7 @@ PRInt32 nsCString::RFind(const char* aString,PRBool aIgnoreCase,PRInt32 anOffset
  *  @return  index in aDest where member of aSet occurs, or -1 if not found
  */
 PRInt32 nsCString::RFindChar(PRUnichar aChar,PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) const{
-  PRInt32 result=nsStr::RFindChar(*this,aChar,aIgnoreCase,anOffset,aCount);
+  PRInt32 result=nsStr::RFindChar1(*this,aChar,aIgnoreCase,anOffset,aCount);
   return result;
 }
 
@@ -1137,7 +1137,7 @@ PRInt32 nsCString::CompareWithConversion(const PRUnichar* aString,PRBool aIgnore
     nsStr::Initialize(temp,eTwoByte);
     temp.mLength=nsCRT::strlen(aString);
     temp.mUStr=(PRUnichar*)aString;
-    return nsStr::StrCompare(*this,temp,aCount,aIgnoreCase);
+    return nsStr::StrCompare1To2(*this,temp,aCount,aIgnoreCase);
   }
   return 0;
 }
@@ -1158,7 +1158,7 @@ PRInt32 nsCString::CompareWithConversion(const char *aCString,PRBool aIgnoreCase
     nsStr::Initialize(temp,eOneByte);
     temp.mLength=nsCRT::strlen(aCString);
     temp.mStr=(char*)aCString;
-    return nsStr::StrCompare(*this,temp,aCount,aIgnoreCase);
+    return nsStr::StrCompare1To1(*this,temp,aCount,aIgnoreCase);
   }
   return 0;
 }
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index 241b6c4b97e..26c681047d7 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -1101,7 +1101,7 @@ PRInt32 nsString::RFind(const char* aString,PRBool aIgnoreCase,PRInt32 anOffset,
  */
 #if 0
 PRInt32 nsString::RFind(PRUnichar aChar,PRInt32 anOffset,PRBool aIgnoreCase) const{
-  PRInt32 result=nsStr::RFindChar(*this,aChar,aIgnoreCase,anOffset);
+  PRInt32 result=nsStr::RFindChar2(*this,aChar,aIgnoreCase,anOffset);
   return result;
 }
 #endif
@@ -1116,7 +1116,7 @@ PRInt32 nsString::RFind(PRUnichar aChar,PRInt32 anOffset,PRBool aIgnoreCase) con
  *  @return  offset of found char, or -1 (kNotFound)
  */
 PRInt32 nsString::RFindChar(PRUnichar aChar,PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) const{
-  PRInt32 result=nsStr::RFindChar(*this,aChar,aIgnoreCase,anOffset,aCount);
+  PRInt32 result=nsStr::RFindChar2(*this,aChar,aIgnoreCase,anOffset,aCount);
   return result;
 }
 
@@ -1204,7 +1204,7 @@ PRInt32 nsString::CompareWithConversion(const char *aCString,PRBool aIgnoreCase,
     temp.mLength= (0<aCount) ? aCount : nsCRT::strlen(aCString);
 
     temp.mStr=(char*)aCString;
-    return nsStr::StrCompare(*this,temp,aCount,aIgnoreCase);
+    return nsStr::StrCompare2To1(*this,temp,aCount,aIgnoreCase);
   }
 
   return 0;
@@ -1219,7 +1219,7 @@ PRInt32 nsString::CompareWithConversion(const char *aCString,PRBool aIgnoreCase,
  * @return  -1,0,1
  */
 PRInt32 nsString::CompareWithConversion(const nsString& aString,PRBool aIgnoreCase,PRInt32 aCount) const {
-  PRInt32 result=nsStr::StrCompare(*this,aString,aCount,aIgnoreCase);
+  PRInt32 result=nsStr::StrCompare2To2(*this,aString,aCount,aIgnoreCase);
   return result;
 }
 
@@ -1239,7 +1239,7 @@ PRInt32 nsString::CompareWithConversion(const PRUnichar* aString,PRBool aIgnoreC
     nsStr::Initialize(temp,eTwoByte);
     temp.mLength=nsCRT::strlen(aString);
     temp.mUStr=(PRUnichar*)aString;
-    return nsStr::StrCompare(*this,temp,aCount,aIgnoreCase);
+    return nsStr::StrCompare2To2(*this,temp,aCount,aIgnoreCase);
   }
 
    return 0;
@@ -1264,7 +1264,7 @@ PRBool nsString::EqualsIgnoreCase(const char* aString,PRInt32 aLength) const {
  * @return TRUE if equal
  */
 PRBool nsString::EqualsWithConversion(const nsString& aString,PRBool aIgnoreCase,PRInt32 aCount) const {
-  PRInt32 theAnswer=nsStr::StrCompare(*this,aString,aCount,aIgnoreCase);
+  PRInt32 theAnswer=nsStr::StrCompare2To2(*this,aString,aCount,aIgnoreCase);
   PRBool  result=PRBool(0==theAnswer);
   return result;
 
diff --git a/mozilla/xpcom/string/obsolete/bufferRoutines.h b/mozilla/xpcom/string/obsolete/bufferRoutines.h
index b41fa7f74b1..81bd1cc17e1 100644
--- a/mozilla/xpcom/string/obsolete/bufferRoutines.h
+++ b/mozilla/xpcom/string/obsolete/bufferRoutines.h
@@ -706,7 +706,6 @@ inline PRInt32 RFindChar2(const char* aDest,PRUint32 aDestLength,PRInt32 anOffse
 
 typedef PRInt32 (*FindChars)(const char* aDest,PRUint32 aDestLength,PRInt32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase,PRInt32 aCount);
 FindChars gFindChars[]={&FindChar1,&FindChar2};
-FindChars gRFindChars[]={&RFindChar1,&RFindChar2};
 
 //----------------------------------------------------------------------------------------
 //
diff --git a/mozilla/xpcom/string/obsolete/nsStr.cpp b/mozilla/xpcom/string/obsolete/nsStr.cpp
index fbdbddc4b5b..4d2586b8131 100644
--- a/mozilla/xpcom/string/obsolete/nsStr.cpp
+++ b/mozilla/xpcom/string/obsolete/nsStr.cpp
@@ -565,8 +565,13 @@ PRInt32 nsStr::RFindSubstr(const nsStr& aDest,const nsStr& aTarget,PRBool aIgnor
  *  @param   aCount tell us how many iterations to perform from offset; -1 means use full length.
  *  @return  index in aDest where member of aSet occurs, or -1 if not found
  */
-PRInt32 nsStr::RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) {
-  return gRFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,anOffset,aChar,aIgnoreCase,aCount);
+PRInt32 nsStr::RFindChar1(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) {
+  NS_ASSERTION(aDest.mCharSize == eOneByte, "Must be 1 bytes");
+  return ::RFindChar1(aDest.mStr,aDest.mLength,anOffset,aChar,aIgnoreCase,aCount);
+}
+PRInt32 nsStr::RFindChar2(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) {
+  NS_ASSERTION(aDest.mCharSize == eTwoByte, "Must be 2 bytes");
+  return ::RFindChar2(aDest.mStr,aDest.mLength,anOffset,aChar,aIgnoreCase,aCount);
 }
 
 
@@ -599,6 +604,44 @@ PRInt32 nsStr::RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnor
   return kNotFound;
 }
 
+// from the start of the old nsStr::StrCompare - now used as helper
+// routines for nsStr::Compare1to1 and so forth
+static inline PRInt32
+GetCompareCount(const PRInt32 aDestLength, const PRInt32 aSourceLength,
+                PRInt32 aCount)
+{
+  PRInt32 minlen=(aSourceLength<aDestLength) ? aSourceLength : aDestLength;
+
+  if(0==minlen) {
+    if ((aDestLength == 0) && (aSourceLength == 0))
+      return 0;
+    if (aDestLength == 0)
+      return -1;
+    return 1;
+  }
+
+  PRInt32 theCount = (aCount<0) ? minlen: MinInt(aCount,minlen);
+    
+  return theCount;
+}
+
+static inline PRInt32
+TranslateCompareResult(const PRInt32 aDestLength, const PRInt32& aSourceLength, PRInt32 result, PRInt32 aCount)
+{
+
+  if (0==result && -1==aCount) {
+    //Since the caller didn't give us a length to test, and minlen characters matched,
+    //we have to assume that the longer string is greater.
+      
+    if (aDestLength != aSourceLength) {
+      //we think they match, but we've only compared minlen characters. 
+      //if the string lengths are different, then they don't really match.
+      result = (aDestLength<aSourceLength) ? -1 : 1;
+    }
+  }
+  
+  return result;
+}
 /**
  * Compare source and dest strings, up to an (optional max) number of chars
  * @param   aDest is the first str to compare
@@ -607,39 +650,59 @@ PRInt32 nsStr::RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnor
  * @param   aIgnorecase tells us whether to search with case sensitivity
  * @return  aDest<aSource=-1;aDest==aSource==0;aDest>aSource=1
  */
-PRInt32 nsStr::StrCompare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
-  PRInt32 result=0;
-
-  if(aCount) {
-    PRInt32 minlen=(aSource.mLength<aDest.mLength) ? aSource.mLength : aDest.mLength;
-
-    if(0==minlen) {
-      if ((aDest.mLength == 0) && (aSource.mLength == 0))
-        return 0;
-      if (aDest.mLength == 0)
-        return -1;
-      return 1;
-    }
-
-    PRInt32 theCount = (aCount<0) ? minlen: MinInt(aCount,minlen);
-    result=(*gCompare[aDest.mCharSize][aSource.mCharSize])(aDest.mStr,aSource.mStr,theCount,aIgnoreCase);
-
-    if (0==result) {
-      if(-1==aCount) {
-
-          //Since the caller didn't give us a length to test, and minlen characters matched,
-          //we have to assume that the longer string is greater.
-
-        if (aDest.mLength != aSource.mLength) {
-          //we think they match, but we've only compared minlen characters. 
-          //if the string lengths are different, then they don't really match.
-          result = (aDest.mLength<aSource.mLength) ? -1 : 1;
-        }
-      } //if
-    }
-
+PRInt32 nsStr::StrCompare1To1(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
+  NS_ASSERTION(aDest.mCharSize == eOneByte, "Must be 1 byte");
+  NS_ASSERTION(aSource.mCharSize == eOneByte, "Must be 1 byte");
+  if (aCount) {
+    PRInt32 theCount = GetCompareCount(aDest.mLength, aSource.mLength, aCount);
+    PRInt32 result = Compare1To1(aDest.mStr, aSource.mStr, theCount, aIgnoreCase);
+    result = TranslateCompareResult(aDest.mLength, aSource.mLength, result, aCount);
+    return result;
   }
-  return result;
+  
+  return 0;
+}
+
+PRInt32 nsStr::StrCompare1To2(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
+  
+  NS_ASSERTION(aDest.mCharSize == eOneByte, "Must be 1 byte");
+  NS_ASSERTION(aSource.mCharSize == eTwoByte, "Must be 2 byte");
+  if (aCount) {
+    PRInt32 theCount = GetCompareCount(aDest.mLength, aSource.mLength, aCount);
+    PRInt32 result = Compare1To2(aDest.mStr, aSource.mStr, theCount, aIgnoreCase);
+    result = TranslateCompareResult(aDest.mLength, aSource.mLength, result, aCount);
+    return result;
+  }
+  
+  return 0;
+}
+
+PRInt32 nsStr::StrCompare2To1(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
+  NS_ASSERTION(aDest.mCharSize == eTwoByte, "Must be 2 byte");
+  NS_ASSERTION(aSource.mCharSize == eOneByte, "Must be 1 byte");
+  
+  if (aCount) {
+    PRInt32 theCount = GetCompareCount(aDest.mLength, aSource.mLength, aCount);
+    PRInt32 result = Compare2To1(aDest.mStr, aSource.mStr, theCount, aIgnoreCase);
+    result = TranslateCompareResult(aDest.mLength, aSource.mLength, result, aCount);
+    return result;
+  }
+  
+  return 0;
+}
+
+PRInt32 nsStr::StrCompare2To2(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
+  NS_ASSERTION(aDest.mCharSize == eTwoByte, "Must be 2 byte");
+  NS_ASSERTION(aSource.mCharSize == eTwoByte, "Must be 2 byte");
+  
+  if (aCount) {
+    PRInt32 theCount = GetCompareCount(aDest.mLength, aSource.mLength, aCount);
+    PRInt32 result = Compare2To2(aDest.mStr, aSource.mStr, theCount, aIgnoreCase);
+    result = TranslateCompareResult(aDest.mLength, aSource.mLength, result, aCount);
+    return result;
+  }
+  
+  return 0;
 }
 
 /**
@@ -851,14 +914,6 @@ nsStr_Hash(const void* key)
   return nsStr::HashCode(*str);
 }
 
-PR_EXTERN(PRIntn)
-nsStr_Compare(const void *v1, const void *v2)
-{
-  nsStr* str1 = (nsStr*)v1;
-  nsStr* str2 = (nsStr*)v2;
-  return nsStr::StrCompare(*str1, *str2, -1, PR_FALSE) == 0;
-}
-
 nsStringInfo*
 nsStringInfo::GetInfo(nsStr& str)
 {
diff --git a/mozilla/xpcom/string/obsolete/nsStr.h b/mozilla/xpcom/string/obsolete/nsStr.h
index 0a3e8c60544..322097684c9 100644
--- a/mozilla/xpcom/string/obsolete/nsStr.h
+++ b/mozilla/xpcom/string/obsolete/nsStr.h
@@ -405,7 +405,14 @@ struct NS_COM nsStr {
    * @param   aIgnorecase tells us whether to use a case-sensitive comparison
    * @return  -1,0,1 depending on <,==,>
    */
-  static PRInt32  StrCompare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase);
+  static PRInt32 StrCompare1To1(const nsStr& aDest,const nsStr& aSource,
+                                PRInt32 aCount,PRBool aIgnoreCase);
+  static PRInt32 StrCompare1To2(const nsStr& aDest, const nsStr& aSource,
+                                PRInt32 aCount, PRBool aIgnoreCase);
+  static PRInt32 StrCompare2To1(const nsStr& aDest, const nsStr& aSource,
+                                PRInt32 aCount, PRBool aIgnoreCase);
+  static PRInt32 StrCompare2To2(const nsStr& aDest, const nsStr& aSource,
+                                PRInt32 aCount, PRBool aIgnoreCase);
 
  /**
   * These methods scan the given string for 1 or more chars in a given direction
@@ -422,7 +429,8 @@ struct NS_COM nsStr {
   static PRInt32 FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
 
   static PRInt32 RFindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount);
-  static PRInt32 RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount);
+  static PRInt32 RFindChar1(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount);
+  static PRInt32 RFindChar2(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount);
   static PRInt32 RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
 
   static void    Overwrite(nsStr& aDest,const nsStr& aSource,PRInt32 anOffset);
diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp
index 355f8a764c7..7876e542a15 100644
--- a/mozilla/xpcom/string/obsolete/nsString.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString.cpp
@@ -1053,7 +1053,7 @@ PRInt32 nsCString::RFind(const char* aString,PRBool aIgnoreCase,PRInt32 anOffset
  *  @return  index in aDest where member of aSet occurs, or -1 if not found
  */
 PRInt32 nsCString::RFindChar(PRUnichar aChar,PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) const{
-  PRInt32 result=nsStr::RFindChar(*this,aChar,aIgnoreCase,anOffset,aCount);
+  PRInt32 result=nsStr::RFindChar1(*this,aChar,aIgnoreCase,anOffset,aCount);
   return result;
 }
 
@@ -1137,7 +1137,7 @@ PRInt32 nsCString::CompareWithConversion(const PRUnichar* aString,PRBool aIgnore
     nsStr::Initialize(temp,eTwoByte);
     temp.mLength=nsCRT::strlen(aString);
     temp.mUStr=(PRUnichar*)aString;
-    return nsStr::StrCompare(*this,temp,aCount,aIgnoreCase);
+    return nsStr::StrCompare1To2(*this,temp,aCount,aIgnoreCase);
   }
   return 0;
 }
@@ -1158,7 +1158,7 @@ PRInt32 nsCString::CompareWithConversion(const char *aCString,PRBool aIgnoreCase
     nsStr::Initialize(temp,eOneByte);
     temp.mLength=nsCRT::strlen(aCString);
     temp.mStr=(char*)aCString;
-    return nsStr::StrCompare(*this,temp,aCount,aIgnoreCase);
+    return nsStr::StrCompare1To1(*this,temp,aCount,aIgnoreCase);
   }
   return 0;
 }
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index 241b6c4b97e..26c681047d7 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -1101,7 +1101,7 @@ PRInt32 nsString::RFind(const char* aString,PRBool aIgnoreCase,PRInt32 anOffset,
  */
 #if 0
 PRInt32 nsString::RFind(PRUnichar aChar,PRInt32 anOffset,PRBool aIgnoreCase) const{
-  PRInt32 result=nsStr::RFindChar(*this,aChar,aIgnoreCase,anOffset);
+  PRInt32 result=nsStr::RFindChar2(*this,aChar,aIgnoreCase,anOffset);
   return result;
 }
 #endif
@@ -1116,7 +1116,7 @@ PRInt32 nsString::RFind(PRUnichar aChar,PRInt32 anOffset,PRBool aIgnoreCase) con
  *  @return  offset of found char, or -1 (kNotFound)
  */
 PRInt32 nsString::RFindChar(PRUnichar aChar,PRBool aIgnoreCase,PRInt32 anOffset,PRInt32 aCount) const{
-  PRInt32 result=nsStr::RFindChar(*this,aChar,aIgnoreCase,anOffset,aCount);
+  PRInt32 result=nsStr::RFindChar2(*this,aChar,aIgnoreCase,anOffset,aCount);
   return result;
 }
 
@@ -1204,7 +1204,7 @@ PRInt32 nsString::CompareWithConversion(const char *aCString,PRBool aIgnoreCase,
     temp.mLength= (0<aCount) ? aCount : nsCRT::strlen(aCString);
 
     temp.mStr=(char*)aCString;
-    return nsStr::StrCompare(*this,temp,aCount,aIgnoreCase);
+    return nsStr::StrCompare2To1(*this,temp,aCount,aIgnoreCase);
   }
 
   return 0;
@@ -1219,7 +1219,7 @@ PRInt32 nsString::CompareWithConversion(const char *aCString,PRBool aIgnoreCase,
  * @return  -1,0,1
  */
 PRInt32 nsString::CompareWithConversion(const nsString& aString,PRBool aIgnoreCase,PRInt32 aCount) const {
-  PRInt32 result=nsStr::StrCompare(*this,aString,aCount,aIgnoreCase);
+  PRInt32 result=nsStr::StrCompare2To2(*this,aString,aCount,aIgnoreCase);
   return result;
 }
 
@@ -1239,7 +1239,7 @@ PRInt32 nsString::CompareWithConversion(const PRUnichar* aString,PRBool aIgnoreC
     nsStr::Initialize(temp,eTwoByte);
     temp.mLength=nsCRT::strlen(aString);
     temp.mUStr=(PRUnichar*)aString;
-    return nsStr::StrCompare(*this,temp,aCount,aIgnoreCase);
+    return nsStr::StrCompare2To2(*this,temp,aCount,aIgnoreCase);
   }
 
    return 0;
@@ -1264,7 +1264,7 @@ PRBool nsString::EqualsIgnoreCase(const char* aString,PRInt32 aLength) const {
  * @return TRUE if equal
  */
 PRBool nsString::EqualsWithConversion(const nsString& aString,PRBool aIgnoreCase,PRInt32 aCount) const {
-  PRInt32 theAnswer=nsStr::StrCompare(*this,aString,aCount,aIgnoreCase);
+  PRInt32 theAnswer=nsStr::StrCompare2To2(*this,aString,aCount,aIgnoreCase);
   PRBool  result=PRBool(0==theAnswer);
   return result;