add virtual SkTypeface::onOpenStream and override that for fontconfig

trunk/src/core/SkTypeface.cpp

 
 /*
  * Copyright 2011 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"
@@ skipping 105 matching lines @@
 size_t SkTypeface::getTableSize(SkFontTableTag tag) const {
     return SkFontHost::GetTableSize(fUniqueID, tag);
 }
 
 size_t SkTypeface::getTableData(SkFontTableTag tag, size_t offset, size_t length,
                                 void* data) const {
     return SkFontHost::GetTableData(fUniqueID, tag, offset, length, data);
 }
 
 SkStream* SkTypeface::openStream(int* ttcIndex) const {
-    if (ttcIndex) {
-        int32_t ndx = 0;
-        (void)SkFontHost::GetFileName(fUniqueID, NULL, 0, &ndx);
-        *ttcIndex = (int)ndx;
+    int ttcIndexStorage;
+    if (NULL == ttcIndex) {
+        // So our subclasses don't need to check for null param
+        ttcIndex = &ttcIndexStorage;
     }
-    return SkFontHost::OpenStream(fUniqueID);
+    return this->onOpenStream(ttcIndex);
 }
 
 int SkTypeface::getUnitsPerEm() const {
     // should we try to cache this in the base-class?
     return this->onGetUPEM();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkFontDescriptor.h"
 
 int SkTypeface::onGetUPEM() const {
     int upem = 0;
 
     SkAdvancedTypefaceMetrics* metrics;
     metrics = this->getAdvancedTypefaceMetrics(
                              SkAdvancedTypefaceMetrics::kNo_PerGlyphInfo,
                              NULL, 0);
     if (metrics) {
         upem = metrics->fEmSize;
         metrics->unref();
     }
     return upem;
 }
 
+SkStream* SkTypeface::onOpenStream(int* ttcIndex) const {
+    if (ttcIndex) {
+        int32_t ndx = 0;
+        (void)SkFontHost::GetFileName(fUniqueID, NULL, 0, &ndx);
+        *ttcIndex = (int)ndx;
+    }
+    return SkFontHost::OpenStream(fUniqueID);
+}
+
 int SkTypeface::onGetTableTags(SkFontTableTag tags[]) const { return 0; }
 size_t SkTypeface::onGetTableData(SkFontTableTag, size_t offset,
                                   size_t length, void* data) const { return 0; }
 void SkTypeface::onGetFontDescriptor(SkFontDescriptor* desc) const {
     desc->setStyle(this->style());
 }