Update to newer Skia font API (flutter#6236)

This function now takes an sk_sp
shenguangyao · Sep 12, 2018 · 1e622d2 · 1e622d2
1 parent 87b4af0
commit 1e622d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/ui/text/asset_manager_font_provider.cc b/lib/ui/text/asset_manager_font_provider.cc
@@ -103,7 +103,7 @@ SkTypeface* AssetManagerFontStyleSet::createTypeface(int i) {
     std::unique_ptr<SkMemoryStream> stream = SkMemoryStream::Make(asset_data);
 
     // Ownership of the stream is transferred.
-    asset.typeface = SkTypeface::MakeFromStream(stream.release());
+    asset.typeface = SkTypeface::MakeFromStream(std::move(stream));
     if (!asset.typeface)
       return nullptr;
   }

diff --git a/lib/ui/text/font_collection.cc b/lib/ui/text/font_collection.cc
@@ -96,7 +96,7 @@ void FontCollection::RegisterFonts(fml::RefPtr<AssetManager> asset_manager) {
 
 void FontCollection::RegisterTestFonts() {
   sk_sp<SkTypeface> test_typeface =
-      SkTypeface::MakeFromStream(GetTestFontData().release());
+      SkTypeface::MakeFromStream(GetTestFontData());
 
   std::unique_ptr<txt::TypefaceFontAssetProvider> font_provider =
       std::make_unique<txt::TypefaceFontAssetProvider>();