bug 130661 TrueType code does not distinguish regular/bold/italic

r=yokoyama@netscape.com, sr=rbs@maths.uq.edu.au, a=scc@mozilla.org

gfx/src/freetype/nsFreeType.cpp

@@ -1340,12 +1340,19 @@ nsFreeTypeFaceRequester(FTC_FaceID face_id, FT_Library lib,
 nsFreeTypeFace *
 nsFreeTypeGetFaceID(nsFontCatalogEntry *aFce)
 {
-  // in this hash each ttc face has a unique key
-  nsCStringKey key(nsFT2FontCatalog::GetFamilyName(aFce));
+  // We need to have separate keys for the different faces in a ttc file.
+  // We append a slash and the face index to the file name to give us a 
+  // unique key for each ttc face.
+  nsCAutoString key_str(nsFT2FontCatalog::GetFileName(aFce));
+  key_str.Append('/');
+  key_str.AppendInt(nsFT2FontCatalog::GetFaceIndex(aFce));
+  nsCStringKey key(key_str);
   nsFreeTypeFace *face = (nsFreeTypeFace *)gFreeTypeFaces->Get(&key);
   if (!face) {
     face = new nsFreeTypeFace(aFce);
     NS_ASSERTION(face, "memory error while creating nsFreeTypeFace");
+    if (!face)
+      return nsnull;
     gFreeTypeFaces->Put(&key, face);
   }
   return face;

gfx/src/x11shared/nsFreeType.cpp

@@ -1340,12 +1340,19 @@ nsFreeTypeFaceRequester(FTC_FaceID face_id, FT_Library lib,
 nsFreeTypeFace *
 nsFreeTypeGetFaceID(nsFontCatalogEntry *aFce)
 {
-  // in this hash each ttc face has a unique key
-  nsCStringKey key(nsFT2FontCatalog::GetFamilyName(aFce));
+  // We need to have separate keys for the different faces in a ttc file.
+  // We append a slash and the face index to the file name to give us a 
+  // unique key for each ttc face.
+  nsCAutoString key_str(nsFT2FontCatalog::GetFileName(aFce));
+  key_str.Append('/');
+  key_str.AppendInt(nsFT2FontCatalog::GetFaceIndex(aFce));
+  nsCStringKey key(key_str);
   nsFreeTypeFace *face = (nsFreeTypeFace *)gFreeTypeFaces->Get(&key);
   if (!face) {
     face = new nsFreeTypeFace(aFce);
     NS_ASSERTION(face, "memory error while creating nsFreeTypeFace");
+    if (!face)
+      return nsnull;
     gFreeTypeFaces->Put(&key, face);
   }
   return face;