SkTypeface to use SkStreamAsset.

src/ports/SkFontConfigInterface_direct.cpp

 /*
  * Copyright 2009 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */
 
 #include <unistd.h>
@@ skipping 94 matching lines @@
 class SkFontConfigInterfaceDirect : public SkFontConfigInterface {
 public:
             SkFontConfigInterfaceDirect();
     virtual ~SkFontConfigInterfaceDirect();
 
     virtual bool matchFamilyName(const char familyName[],
                                  SkTypeface::Style requested,
                                  FontIdentity* outFontIdentifier,
                                  SkString* outFamilyName,
                                  SkTypeface::Style* outStyle) SK_OVERRIDE;
-    SkStream* openStream(const FontIdentity&) SK_OVERRIDE;
+    SkStreamAsset* openStream(const FontIdentity&) SK_OVERRIDE;
 
     // new APIs
     SkDataTable* getFamilyNames() SK_OVERRIDE;
     virtual bool matchFamilySet(const char inFamilyName[],
                                 SkString* outFamilyName,
                                 SkTArray<FontIdentity>*) SK_OVERRIDE;
 
 private:
     SkMutex mutex_;
 };
@@ skipping 419 matching lines @@
     }
     if (outFamilyName) {
         outFamilyName->set(post_config_family);
     }
     if (outStyle) {
         *outStyle = GetFontStyle(match);
     }
     return true;
 }
 
-SkStream* SkFontConfigInterfaceDirect::openStream(const FontIdentity& identity) {
+SkStreamAsset* SkFontConfigInterfaceDirect::openStream(const FontIdentity& identity) {
     return SkStream::NewFromFile(identity.fString.c_str());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static bool find_name(const SkTDArray<const char*>& list, const char* str) {
     int count = list.count();
     for (int i = 0; i < count; ++i) {
         if (!strcmp(list[i], str)) {
             return true;
@@ skipping 160 matching lines @@
                 *trimmedMatches.append() = match[i];
             }
         }
 
         SkFontStyleSet_FC* sset = SkNEW_ARGS(SkFontStyleSet_FC,
                                              (trimmedMatches.begin(),
                                               trimmedMatches.count()));
 #endif
     return false;
 }