Update find_name_and_attributes to take ttc index.

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"
 
 #include "SkFontConfigParser_android.h"
 #include "SkFontConfigTypeface.h"
+#include "SkFontHost_FreeType_common.h"
 #include "SkFontMgr.h"
 #include "SkGlyphCache.h"
 #include "SkPaint.h"
 #include "SkString.h"
 #include "SkStream.h"
 #include "SkThread.h"
 #include "SkTypefaceCache.h"
 #include "SkTArray.h"
 #include "SkTDict.h"
 #include "SkTSearch.h"
@@ skipping 165 matching lines @@
                                   const char* name, FamilyRecID familyRecID) {
     SkAutoAsciiToLC tolc(name);
     if (familyNameDict.find(tolc.lc())) {
         SkDebugf("---- system font attempting to use a the same name [%s] for"
                  "multiple families. skipping subsequent occurrences", tolc.lc());
     } else {
         familyNameDict.set(tolc.lc(), familyRecID);
     }
 }
 
-// Defined in SkFontHost_FreeType.cpp
-bool find_name_and_attributes(SkStream* stream, SkString* name,
-                              SkTypeface::Style* style, bool* isFixedWidth);
-
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontConfigInterfaceAndroid::SkFontConfigInterfaceAndroid(SkTDArray<FontFamily*>& fontFamilies) :
         fFonts(fontFamilies.count()),
         fFontFamilies(fontFamilies.count() / FamilyRec::FONT_STYLE_COUNT),
         fFamilyNameDict(1024),
         fDefaultFamilyRecID(INVALID_FAMILY_REC_ID),
         fFallbackFontDict(128),
         fFallbackFontAliasDict(128),
         fLocaleFallbackFontList(NULL) {
@@ skipping 21 matching lines @@
             fontRec.fStyle = SkTypeface::kNormal;
             fontRec.fIsValid = false;
             fontRec.fFamilyRecID = familyRecID;
 
             const FontRecID fontRecID = fFonts.count() - 1;
 
             SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(filename.c_str()));
             if (stream.get() != NULL) {
                 bool isFixedWidth;
                 SkString name;
-                fontRec.fIsValid = find_name_and_attributes(stream.get(), &name,
-                                                            &fontRec.fStyle, &isFixedWidth);
+                fontRec.fIsValid = SkTypeface_FreeType::ScanFont(stream.get(), 0,
+                                                                 &name, &fontRec.fStyle,
+                                                                 &isFixedWidth);
             } else {
                 if (!family->fIsFallbackFont) {
                     SkDebugf("---- failed to open <%s> as a font\n", filename.c_str());
                 }
             }
 
             if (fontRec.fIsValid) {
                 DEBUG_FONT(("---- SystemFonts[%d][%d] fallback=%d file=%s",
                            i, fFonts.count() - 1, family->fIsFallbackFont, filename.c_str()));
             } else {
@@ skipping 651 matching lines @@
     return SkSafeRef(retTypeface);
 }
 
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr::Factory() {
     return NULL;
 }