start to plumb ttcIndex into fonthost. For now just add to SkFontStream and its callers.

trunk/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 "SkFontDescriptor.h"
 #include "SkFontHost.h"
@@ skipping 229 matching lines @@
         }
         // failed to allocate, so just skip and create-from-name
         stream->skip(length);
     }
 
     return SkFontHost::CreateTypeface(NULL, familyName, style);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkStream* open_stream(const FontConfigTypeface* face) {
+static SkStream* open_stream(const FontConfigTypeface* face, int* ttcIndex) {
     SkStream* stream = face->getLocalStream();
+    int index;
     if (stream) {
         stream->ref();
+        // should have been provided by CreateFromStream()
+        *ttcIndex = 0;
     } else {
         SkAutoTUnref<SkFontConfigInterface> fci(RefFCI());
         if (NULL == fci.get()) {
             return NULL;
         }
         stream = fci->openStream(face->getIdentity());
+        // ttcIndex should be returned explicitly by openStream()
+        *ttcIndex = (int)face->getIdentity().fIntPtr;
     }
     return stream;
 }
 
 SkStream* SkFontHost::OpenStream(uint32_t id) {
     FontConfigTypeface* face = (FontConfigTypeface*)SkTypefaceCache::FindByID(id);
     if (NULL == face) {
         return NULL;
     }
-    return open_stream(face);
+    
+    int ttcIndex;
+    // We should return ttcIndex from this call.
+    return open_stream(face, &ttcIndex);
 }
 
 size_t SkFontHost::GetFileName(SkFontID fontID, char path[], size_t length,
                                int32_t* index) {
     FontConfigTypeface* face = (FontConfigTypeface*)SkTypefaceCache::FindByID(fontID);
     if (NULL == face || face->getLocalStream()) {
         return 0;
     }
 
     // Here we cheat, and "know" what is in the identity fields.
 
     const SkString& filename = face->getIdentity().fString;
     if (index) {
         *index = (int32_t)face->getIdentity().fIntPtr;
     }
     if (path) {
         size_t len = SkMin32(length, filename.size());
         memcpy(path, filename.c_str(), len);
     }
     return filename.size();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 int FontConfigTypeface::onGetTableTags(SkFontTableTag tags[]) const {
-    SkAutoTUnref<SkStream> stream(open_stream(this));
-    return stream.get() ? SkFontStream::GetTableTags(stream, tags) : 0;
+    int ttcIndex;
+    SkAutoTUnref<SkStream> stream(open_stream(this, &ttcIndex));
+    return stream.get() ?

[bungeman-skia, 2013/03/05 22:07:33]

I know it isn't as popular, but I prefer formatting like

return stream.get()
    ? SkFontStream::GetTableTags(stream, ttcIndex, tags)
    : 0

it makes the operator stand out more and looks more like a list of alternatives.
When the operator tokens are at the ends of lines they kind of get lost.

+                SkFontStream::GetTableTags(stream, ttcIndex, tags) :
+                0;
 }
 
 size_t FontConfigTypeface::onGetTableData(SkFontTableTag tag, size_t offset,
                                   size_t length, void* data) const {
-    SkAutoTUnref<SkStream> stream(open_stream(this));
+    int ttcIndex;
+    SkAutoTUnref<SkStream> stream(open_stream(this, &ttcIndex));
     return stream.get() ?
-               SkFontStream::GetTableData(stream, tag, offset, length, data) :
-               0;
+                SkFontStream::GetTableData(stream, ttcIndex,
+                                           tag, offset, length, data) :
+                0;
 }
 
 void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc) const {
     desc->setStyle(this->style());
     desc->setFamilyName(this->getFamilyName());
 }