Add SkTypeface* parameter to SkScalerContext (and its callers)

trunk/src/ports/SkFontHost_simple.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 "SkFontHost.h"
@@ skipping 395 matching lines @@
 
 // these globals are assigned (once) by load_system_fonts()
 static FamilyRec* gDefaultFamily;
 static SkTypeface* gDefaultNormal;
 
 /*  This is sized conservatively, assuming that it will never be a size issue.
     It will be initialized in load_system_fonts(), and will be filled with the
     fontIDs that can be used for fallback consideration, in sorted order (sorted
     meaning element[0] should be used first, then element[1], etc. When we hit
     a fontID==0 in the array, the list is done, hence our allocation size is
-    +1 the total number of possible system fonts. Also see NextLogicalFont().
+    +1 the total number of possible system fonts. Also see NextLogicalTypeface().
  */
 static uint32_t gFallbackFonts[SK_ARRAY_COUNT(gSystemFonts)+1];
 
 /*  Called once (ensured by the sentinel check at the beginning of our body).
     Initializes all the globals, and register the system fonts.
  */
 static void load_system_fonts() {
     // check if we've already be called
     if (NULL != gDefaultNormal) {
         return;
@@ skipping 169 matching lines @@
         }
         if (index) {
             *index = 0; // we don't have collections (yet)
         }
         return size;
     } else {
         return 0;
     }
 }
 
-SkFontID SkFontHost::NextLogicalFont(SkFontID currFontID, SkFontID origFontID) {
+SkTypeface* SkFontHost::NextLogicalTypeface(SkFontID currFontID, SkFontID origFontID) {
     load_system_fonts();
 
     /*  First see if fontID is already one of our fallbacks. If so, return
         its successor. If fontID is not in our list, then return the first one
         in our list. Note: list is zero-terminated, and returning zero means
         we have no more fonts to use for fallbacks.
      */
     const uint32_t* list = gFallbackFonts;
     for (int i = 0; list[i] != 0; i++) {
         if (list[i] == currFontID) {
-            return list[i+1];
+            return SkSafeRef(find_from_uniqueID(list[i+1]));
         }
     }
-    return list[0];
+    return SkSafeRef(list[0]);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
     if (NULL == stream || stream->getLength() <= 0) {
         return NULL;
     }
 
     SkTypeface::Style style;
     if (find_name_and_attributes(stream, NULL, &style, NULL)) {
         return SkNEW_ARGS(StreamTypeface, (style, false, NULL, stream));
     } else {
         return NULL;
     }
 }
 
 SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
     SkStream* stream = SkNEW_ARGS(SkMMAPStream, (path));
     SkTypeface* face = SkFontHost::CreateTypefaceFromStream(stream);
     // since we created the stream, we let go of our ref() here
     stream->unref();
     return face;
 }