roll skia, along with API change to SkFontHost

skia/ext/SkFontHost_fontconfig.cpp

 /* libs/graphics/ports/SkFontHost_fontconfig.cpp
 **
 ** Copyright 2008, Google Inc.
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
 ** You may obtain a copy of the License at
 **
 **     http://www.apache.org/licenses/LICENSE-2.0
 **
@@ skipping 213 matching lines @@
 void SkFontHost::Serialize(const SkTypeface*, SkWStream*) {
     SkASSERT(!"SkFontHost::Serialize unimplemented");
 }
 
 SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
     SkASSERT(!"SkFontHost::Deserialize unimplemented");
     return NULL;
 }
 
 // static
-uint32_t SkFontHost::NextLogicalFont(SkFontID fontID) {
+uint32_t SkFontHost::NextLogicalFont(SkFontID curr, SkFontID orig) {
     // We don't handle font fallback, WebKit does.
     return 0;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class SkFileDescriptorStream : public SkStream {
   public:
     SkFileDescriptorStream(int fd) {
         memory_ = NULL;
@@ skipping 106 matching lines @@
         if (!path)
           return 1;
     }
 
     if (path)
         SkASSERT(!"SkFontHost::GetFileName does not support the font path "
                   "retrieval.");
 
     return 0;
 }