Fixing rtm++ bug 55587. nsAReadableString::FindChar() was returning the index from the offset to the character if found in stead of the index from the beginning of the string. r=kin, sr&a=scc

string/public/nsAReadableString.h

@@ -737,7 +737,7 @@ basic_nsAReadableString<CharT>::FindChar( CharT aChar, PRUint32 aOffset ) const
         PRInt32 fragmentLength = iter.size_forward();
         const CharT* charFoundAt = nsCharTraits<CharT>::find(iter.get(), fragmentLength, aChar);
         if ( charFoundAt )
-          return lengthSearched + (charFoundAt-iter.get());
+          return lengthSearched + (charFoundAt-iter.get()) + aOffset;
 
         lengthSearched += fragmentLength;
         iter.advance(fragmentLength);

xpcom/ds/nsAReadableString.h

@@ -737,7 +737,7 @@ basic_nsAReadableString<CharT>::FindChar( CharT aChar, PRUint32 aOffset ) const
         PRInt32 fragmentLength = iter.size_forward();
         const CharT* charFoundAt = nsCharTraits<CharT>::find(iter.get(), fragmentLength, aChar);
         if ( charFoundAt )
-          return lengthSearched + (charFoundAt-iter.get());
+          return lengthSearched + (charFoundAt-iter.get()) + aOffset;
 
         lengthSearched += fragmentLength;
         iter.advance(fragmentLength);

xpcom/string/public/nsAReadableString.h

@@ -737,7 +737,7 @@ basic_nsAReadableString<CharT>::FindChar( CharT aChar, PRUint32 aOffset ) const
         PRInt32 fragmentLength = iter.size_forward();
         const CharT* charFoundAt = nsCharTraits<CharT>::find(iter.get(), fragmentLength, aChar);
         if ( charFoundAt )
-          return lengthSearched + (charFoundAt-iter.get());
+          return lengthSearched + (charFoundAt-iter.get()) + aOffset;
 
         lengthSearched += fragmentLength;
         iter.advance(fragmentLength);