Update Android's FontHost to return NULL if familyName does not match

src/ports/SkFontConfigInterface_android.cpp

 
 /*
  * Copyright 2013 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigInterface.h"
 #include "SkTypeface_android.h"
@@ skipping 396 matching lines @@
         SkAutoAsciiToLC tolc(familyName);
         if (fFamilyNameDict.find(tolc.lc(), &familyRecID)) {
             exactNameMatch = true;
         }
     } else {
         familyRecID = fDefaultFamilyRecID;
 
     }
 
     if (INVALID_FAMILY_REC_ID == familyRecID) {
-        //TODO this ensures that we always return something
-        familyRecID = fDefaultFamilyRecID;
-        //return false;
+        return false;
     }
 
     FontRecID fontRecID = find_best_style(fFontFamilies[familyRecID], style);
     FontRec& fontRec = fFonts[fontRecID];
 
     if (NULL != outFontIdentifier) {
         outFontIdentifier->fID = fontRecID;
         outFontIdentifier->fTTCIndex = 0;
         outFontIdentifier->fString.set(fontRec.fFileName);
 //        outFontIdentifier->fStyle = fontRec.fStyle;
@@ skipping 58 matching lines @@
     if (!face) {
         // look for it in the typeface cache
         face = SkTypefaceCache::FindByProcAndRef(find_proc, &fontRecID);
 
         // if it is not in the cache then create it
         if (!face) {
             const char* familyName = NULL;
             SkAssertResult(fFamilyNameDict.findKey(fontRec.fFamilyRecID, &familyName));
             SkASSERT(familyName);
             face = SkTypeface::CreateFromName(familyName, fontRec.fStyle);
+            SkASSERT(face);

[reed1, 2013/09/18 19:51:37]

Why are we asserting here?

[djsollen, 2013/09/18 19:57:30]

This function takes fontRecID's which correspond to known fonts on the device
and creates a SkTypeface object around it.  Since we know the font exists and
what the name is then we expect it to succeed.  That being said we probably
don't need the assert here since it also exists later on in the function.

         }
 
         // store the result for subsequent lookups
         fontRec.fTypeface = face;
     }
     SkASSERT(face);
     return face;
 }
 
 bool SkFontConfigInterfaceAndroid::getFallbackFamilyNameForChar(SkUnichar uni, SkString* name) {
@@ skipping 326 matching lines @@
     return SkCreateTypefaceForScriptNG(getHBScriptFromHBScriptOld(script), style, fontVariant);
 }
 
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr::Factory() {
     return NULL;
 }