Add SkTypeface* parameter to SkScalerContext (and its callers)

trunk/src/ports/SkFontHost_linux.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 "SkFontHost.h"
@@ skipping 550 matching lines @@
     }
     return stream;
 }
 
 size_t SkFontHost::GetFileName(SkFontID fontID, char path[], size_t length,
                                int32_t* index) {
 //    SkDebugf("SkFontHost::GetFileName unimplemented\n");
     return 0;
 }
 
-SkFontID SkFontHost::NextLogicalFont(SkFontID currFontID, SkFontID origFontID) {
-    return 0;
+SkTypeface* SkFontHost::NextLogicalTypeface(SkFontID currFontID, SkFontID origFontID) {
+    return NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
     if (NULL == stream || stream->getLength() <= 0) {
         SkDELETE(stream);
         return NULL;
     }
 
     bool isFixedWidth;
     SkTypeface::Style style;
     if (find_name_and_attributes(stream, NULL, &style, &isFixedWidth)) {
         return SkNEW_ARGS(StreamTypeface, (style, false, NULL, stream, isFixedWidth));
     } else {
         return NULL;
     }
 }
 
 SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
     SkTypeface* face = NULL;
     SkFILEStream* stream = SkNEW_ARGS(SkFILEStream, (path));
 
     if (stream->isValid()) {
         face = CreateTypefaceFromStream(stream);
     }
     stream->unref();
     return face;
 }