API modifications needed to upstream Android font changes.

src/ports/SkFontHost_android.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"
 #include "SkFontHost_FreeType_common.h"
 #include "SkFontDescriptor.h"
@@ skipping 783 matching lines @@
 
     if (NULL == tf) {
         tf = find_best_face(gDefaultFamily, style);
     }
 
     // we ref(), since the semantic is to return a new instance
     tf->ref();
     return tf;
 }
 
-SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID,
-                                         SkFontID origFontID) {
-#if defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID,
+                                         const SkPaintOptionsAndroid& options) {
+#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
     // Skia does not support font fallback for ndk applications in order to
     // enable clients such as WebKit to customize their font selection.
     // Clients can use GetFallbackFamilyNameForChar() to get the fallback
     // font for individual characters.
     return NULL;
-#else
+#endif
     SkAutoMutexAcquire  ac(gFamilyHeadAndNameListMutex);
 
     load_system_fonts();
 
     const SkTypeface* origTypeface = find_from_uniqueID(origFontID);
     const SkTypeface* currTypeface = find_from_uniqueID(currFontID);
 
     SkASSERT(origTypeface != 0);
     SkASSERT(currTypeface != 0);
     SkASSERT(gFallbackFonts);
@@ skipping 15 matching lines @@
             const SkTypeface* nextTypeface = find_from_uniqueID(list[i+1]);
             return SkRef(find_typeface(nextTypeface, origTypeface->style()));
         }
     }
 
     // If we get here, currFontID was not a fallback, so we start at the
     // beginning of our list. Assuming there is at least one fallback font,
     // i.e. gFallbackFonts[0] != 0.
     const SkTypeface* firstTypeface = find_from_uniqueID(list[0]);
     return SkRef(find_typeface(firstTypeface, origTypeface->style()));
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
     if (NULL == stream || stream->getLength() <= 0) {
         return NULL;
     }
 
     bool isFixedPitch;
@@ skipping 76 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkFontMgr.h"
 
 SkFontMgr* SkFontMgr::Factory() {
     // todo
     return NULL;
 }