Update find_name_and_attributes to take ttc index.

src/ports/SkFontHost_FreeType.cpp

 
 /*
  * Copyright 2006 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 "SkAdvancedTypefaceMetrics.h"
 #include "SkBitmap.h"
@@ skipping 1652 matching lines @@
             return 0;
         }
     }
 
     return size;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-/*  Export this so that other parts of our FonttHost port can make use of our
-    ability to extract the name+style from a stream, using FreeType's api.
-*/
-bool find_name_and_attributes(SkStream* stream, SkString* name,
-                              SkTypeface::Style* style, bool* isFixedPitch) {
+/*  Exported so that SkFontMgrs can make use of our ability to extract
+ *  name and style from a stream, using FreeType's API.
+ */
+bool find_name_and_attributes(SkStream* stream, int ttcIndex,

[tomhudson, 2014/07/11 13:30:21]

If we're exporting this, shouldn't it have an SkCamelCaps name, and consider
belonging to a namespace?

[bungeman-skia, 2014/07/11 14:33:26]

Sure, why not. It wasn't static to begin with, so it doesn't make much sense to
use the current naming convention. Always difficult to tell how far to take
these sort of refactors.

+                              SkString* name, SkTypeface::Style* style, bool* isFixedPitch)
+{
     FT_Library  library;
     if (FT_Init_FreeType(&library)) {
         return false;
     }
 
     FT_Open_Args    args;
     memset(&args, 0, sizeof(args));
 
     const void* memoryBase = stream->getMemoryBase();
     FT_StreamRec    streamRec;
 
     if (NULL != memoryBase) {
         args.flags = FT_OPEN_MEMORY;
         args.memory_base = (const FT_Byte*)memoryBase;
         args.memory_size = stream->getLength();
     } else {
         memset(&streamRec, 0, sizeof(streamRec));
         streamRec.size = stream->getLength();
         streamRec.descriptor.pointer = stream;
         streamRec.read  = sk_stream_read;
         streamRec.close = sk_stream_close;
 
         args.flags = FT_OPEN_STREAM;
         args.stream = &streamRec;
     }
 
     FT_Face face;
-    if (FT_Open_Face(library, &args, 0, &face)) {
+    if (FT_Open_Face(library, &args, ttcIndex, &face)) {
         FT_Done_FreeType(library);
         return false;
     }
 
     int tempStyle = SkTypeface::kNormal;
     if (face->style_flags & FT_STYLE_FLAG_BOLD) {
         tempStyle |= SkTypeface::kBold;
     }
     if (face->style_flags & FT_STYLE_FLAG_ITALIC) {
         tempStyle |= SkTypeface::kItalic;
     }
 
     if (name) {
         name->set(face->family_name);
     }
     if (style) {
         *style = (SkTypeface::Style) tempStyle;
     }
     if (isFixedPitch) {
         *isFixedPitch = FT_IS_FIXED_WIDTH(face);
     }
 
     FT_Done_Face(face);
     FT_Done_FreeType(library);
     return true;
 }