Bug 288143 - Browser goes into infinite loop while processing HTML font attributes, patch by Mats Palmgren <mats.palmgren@bredband.net> r=jst sr=shaver a=me

gfx/src/gtk/nsFontMetricsGTK.h

@@ -380,7 +380,7 @@ public:
   nsFontGTK   *mSubstituteFont;
 
   nsCStringArray mFonts;
-  PRUint16       mFontsIndex;
+  PRInt32        mFontsIndex;
   nsAutoVoidArray   mFontIsGeneric;
 
   nsCAutoString     mDefaultFont;

gfx/src/os2/nsFontMetricsOS2.h

@@ -290,12 +290,12 @@ public:
 
   nsCOMPtr<nsIAtom>   mLangGroup;
   nsStringArray       mFonts;
-  PRUint16            mFontsIndex;
+  PRInt32             mFontsIndex;
   nsVoidArray         mLoadedFonts;
   nsFontOS2*          mUnicodeFont;
   nsFontOS2*          mWesternFont;
 
-  PRUint16            mGenericIndex;
+  PRInt32             mGenericIndex;
   nsString            mGeneric;
   nsString            mUserDefined;
 

gfx/src/qt/nsFontMetricsQt.h

@@ -171,7 +171,7 @@ public:
 
     nsCOMPtr<nsIAtom> mLangGroup;
     nsCStringArray    mFonts;
-    PRUint16          mFontsIndex;
+    PRInt32           mFontsIndex;
     nsVoidArray       mFontIsGeneric;
     nsCAutoString     mDefaultFont;
     nsCString         *mGeneric;

gfx/src/windows/nsFontMetricsWin.h

@@ -275,11 +275,11 @@ public:
 
   nsCOMPtr<nsIAtom>   mLangGroup;
   nsStringArray       mFonts;
-  PRUint16            mFontsIndex;
+  PRInt32             mFontsIndex;
   nsVoidArray         mLoadedFonts;
   nsFontWin          *mSubstituteFont;
 
-  PRUint16            mGenericIndex;
+  PRInt32             mGenericIndex;
   nsString            mGeneric;
 
   nsString            mUserDefined;

gfx/src/xlib/nsFontMetricsXlib.h

@@ -415,7 +415,7 @@ public:
   nsFontXlib  *mSubstituteFont;
 
   nsCStringArray    mFonts;
-  PRUint16          mFontsIndex;
+  PRInt32           mFontsIndex;
   nsAutoVoidArray   mFontIsGeneric;
 
   nsCAutoString     mDefaultFont;