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 94 matching lines @@
     SkTypeface::Style outStyle;
     if (!fci->matchFamilyName(familyName, style, &indentity, &outFamilyName, &outStyle)) {
         return NULL;
     }
 
     // check if we, in fact, already have this. perhaps fontconfig aliased the
     // requested name to some other name we actually have...
     rec.fFamilyName = outFamilyName.c_str();
     rec.fStyle = SkFontStyle(outStyle);
     face = SkTypefaceCache::FindByProcAndRef(find_proc, &rec);
     if (face) {

[Jun Mukai, 2015/01/12 23:50:43]

You'll have to put the face_orig to the cache in this case. If outFamilyName
exactly matches to an existing one in the cache, face_orig never comes to the
cache.
See my comments on crbug.com/444894#c10 and
https://codereview.chromium.org/844333004

[kochi, 2015/01/13 04:25:01]

Thanks for your further investigation!
Applied your change into this CL (and the description as well).

         return face;
     }
 
     face = FontConfigTypeface::Create(SkFontStyle(outStyle), indentity, outFamilyName);
     SkTypefaceCache::Add(face, requestedStyle);
+    // 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), indentity, SkString(familyName));
+        SkTypefaceCache::Add(face_orig, requestedStyle);
+    }
     //SkDebugf("add face <%s> <%s> %p [%d]\n",
     //         familyName, outFamilyName.c_str(),
     //         face, face->getRefCnt());
     return face;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkStream* FontConfigTypeface::onOpenStream(int* ttcIndex) const {
     SkStream* stream = this->getLocalStream();
@@ skipping 38 matching lines @@
 void FontConfigTypeface::onGetFamilyName(SkString* familyName) const {
     *familyName = this->getFamilyName();
 }
 
 void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
                                              bool* isLocalStream) const {
     desc->setFamilyName(this->getFamilyName());
     desc->setFontIndex(this->getIdentity().fTTCIndex);
     *isLocalStream = SkToBool(this->getLocalStream());
 }