Fix issues related to resolving fonts based on 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 54 matching lines @@
     SkTypeface::Style fStyle;
 };
 
 static bool find_proc(SkTypeface* face, SkTypeface::Style style, void* ctx) {
     FontConfigTypeface* fci = (FontConfigTypeface*)face;
     const FindRec* rec = (const FindRec*)ctx;
 
     return rec->fStyle == style && fci->isFamilyName(rec->fFamilyName);
 }
 
+static bool find_proc_by_id(SkTypeface* face, SkTypeface::Style style, void* ctx) {
+    const uint32_t* fontID = (const uint32_t*)ctx;
+    uint32_t currFontID = ((FontConfigTypeface*)face)->getIdentity().fID;
+    return currFontID == *fontID;
+}
+
 SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
                                        const char familyName[],
                                        SkTypeface::Style style) {
     SkAutoTUnref<SkFontConfigInterface> fci(RefFCI());
     if (NULL == fci.get()) {
         return NULL;
     }
 
     if (familyFace) {
         FontConfigTypeface* fct = (FontConfigTypeface*)familyFace;
         familyName = fct->getFamilyName();
     }
 
     FindRec rec(familyName, style);
     SkTypeface* face = SkTypefaceCache::FindByProcAndRef(find_proc, &rec);
     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)) {
+                              &identity, &outFamilyName, &outStyle)) {
         return NULL;
     }
 
-    face = SkNEW_ARGS(FontConfigTypeface, (outStyle, indentity, outFamilyName));
+    face = SkTypefaceCache::FindByProcAndRef(find_proc_by_id, &identity.fID);

[reed1, 2013/06/05 13:23:57]

this may be correct, but is it strictly needed for the short/mid-term? I thought
the null-check in SkTypeface.cpp was sufficient.

[djsollen, 2013/06/05 13:51:59]

No this is still needed. If an app asks for a font that we don't have we return
the default, but instead of using the default in the cache we create a new one. 
The NULL case was just a optimization of the most common use case.

+    if (face) {
+        return face;
+    }
+
+    face = SkNEW_ARGS(FontConfigTypeface, (outStyle, identity, outFamilyName));
     SkTypefaceCache::Add(face, style);
 //    SkDebugf("add face <%s> <%s> %p [%d]\n", familyName, outFamilyName.c_str(), face, face->getRefCnt());
     return face;
 }
 
 SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
     if (!stream) {
         return NULL;
     }
     const size_t length = stream->getLength();
     if (!length) {
         return NULL;
     }
     if (length >= 1024 * 1024 * 1024) {
         return NULL;  // don't accept too large fonts (>= 1GB) for safety.
     }
 
     // TODO should the caller give us the style?
     SkTypeface::Style style = SkTypeface::kNormal;
     SkTypeface* face = SkNEW_ARGS(FontConfigTypeface, (style, stream));
-    SkTypefaceCache::Add(face, style);
     return face;
 }
 
 SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
     SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
     return stream.get() ? CreateTypefaceFromStream(stream) : NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ skipping 53 matching lines @@
                 : 0;
 }
 
 void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
                                              bool* isLocalStream) const {
     desc->setFamilyName(this->getFamilyName());
     *isLocalStream = SkToBool(this->getLocalStream());
 }
 
 ///////////////////////////////////////////////////////////////////////////////