Cache SkTypeface for alternative family name

src/ports/SkFontHost_fontconfig.cpp

 /*
  * Copyright 2008 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigInterface.h"
 #include "SkFontConfigTypeface.h"
 #include "SkFontDescriptor.h"
@@ skipping 87 matching lines @@
     SkFontStyle requestedStyle(style);
     NameStyle nameStyle(familyName, requestedStyle);
     SkTypeface* face = SkTypefaceCache::FindByProcAndRef(find_by_NameStyle, &nameStyle);
     if (face) {
         //SkDebugf("found cached face <%s> <%s> %p [%d]\n",
         //         familyName, ((FontConfigTypeface*)face)->getFamilyName(),
         //         face, face->getRefCnt());
         return face;
     }
 
-    SkFontConfigInterface::FontIdentity indentity;
+    SkFontConfigInterface::FontIdentity identity;
     SkString outFamilyName;
     SkTypeface::Style outStyle;
-    if (!fci->matchFamilyName(familyName, style, &indentity, &outFamilyName, &outStyle)) {
+    if (!fci->matchFamilyName(familyName, style, &identity, &outFamilyName, &outStyle)) {
         return NULL;
     }
 
-    // Check if a typeface with this FontIdentity is already in the FontIdentity cache.
-    face = SkTypefaceCache::FindByProcAndRef(find_by_FontIdentity, &indentity);
+    // Check if a typeface with this outFamily is already in the FontIdentity cache.
+    face = SkTypefaceCache::FindByProcAndRef(find_by_FontIdentity, &identity);
     if (!face) {
-        face = FontConfigTypeface::Create(SkFontStyle(outStyle), indentity, outFamilyName);
+        face = FontConfigTypeface::Create(SkFontStyle(outStyle), identity, outFamilyName);
         // Add this FontIdentity to the FontIdentity cache.
         SkTypefaceCache::Add(face, requestedStyle);
     }
     // TODO: Ensure requested NameStyle and resolved NameStyle are both in the NameStyle cache.
 
     //SkDebugf("add face <%s> <%s> %p [%d]\n",
     //         familyName, outFamilyName.c_str(),
     //         face, face->getRefCnt());
+
+    // If any aliased name is returned for the requested family, cache SkTypeface
+    // with the original family name so the following lookups will hit the cache.
+    if (!outFamilyName.equals(familyName)) {
+        SkTypeface* face_orig =
+                FontConfigTypeface::Create(SkFontStyle(outStyle), identity, SkString(familyName));
+        SkTypefaceCache::Add(face_orig, requestedStyle);
+        //SkDebugf("add face <%s> %p [%d]\n",
+        //         familyName, face_orig, face_orig->getRefCnt());
+    }
     return face;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkStreamAsset* FontConfigTypeface::onOpenStream(int* ttcIndex) const {
     SkStreamAsset* stream = this->getLocalStream();
     if (stream) {
         // TODO: should have been provided by CreateFromStream()
         *ttcIndex = 0;
@@ skipping 13 matching lines @@
     *familyName = fFamilyName;
 }
 
 void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
                                              bool* isLocalStream) const {
     SkString name;
     this->getFamilyName(&name);
     desc->setFamilyName(name.c_str());
     *isLocalStream = SkToBool(this->getLocalStream());
 }