Upstream Android Changes from K release

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 615 matching lines @@
     const SkTypeface* origTypeface = SkTypefaceCache::FindByID(origFontID);
     if (NULL != origTypeface) {
         origStyle = origTypeface->style();
     }
 
     // we must convert currTypeface into a FontRecID
     FontRecID currFontRecID = INVALID_FONT_REC_ID;
     const SkTypeface* currTypeface = SkTypefaceCache::FindByID(currFontID);
     // non-system fonts are not in the font cache so if we are asked to fallback
     // for a non-system font we will start at the front of the chain.
-    if (NULL != currTypeface && currFontID != origFontID) {
+    if (NULL != currTypeface) {
         currFontRecID = ((FontConfigTypeface*)currTypeface)->getIdentity().fID;
         SkASSERT(INVALID_FONT_REC_ID != currFontRecID);
     }
 
     FamilyRecID currFamilyRecID = INVALID_FAMILY_REC_ID;
     if (INVALID_FONT_REC_ID != currFontRecID) {
         currFamilyRecID = fFonts[currFontRecID].fFamilyRecID;
     }
 
     // lookup the index next font in the chain
@@ skipping 259 matching lines @@
     return SkSafeRef(retTypeface);
 }
 
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr::Factory() {
     return NULL;
 }