commit 271d1d900130418f5c9a25ef2182e6e7665cba91
author Mike Reed <reed@google.com> Mon Sep 03 21:10:10 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 04 15:24:12 2018 +0000
tree 48ca718b46d566c06970450ac2a209ef6409776c
parent c8a9b3ba69a094236f8a0059f2be6f980430b60e

Change SkTypeface::MakeFromStream to take unique_ptr

Also, add MakeFromData variant, which matches SkFontMgr

Bug: skia:8350
Change-Id: Ia220496bab8ecf0e7eefaf0c8b62d88ea1394a17
Reviewed-on: https://skia-review.googlesource.com/150969
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>

tests/SerializationTest.cpp

diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index 59733fe..ccc907c 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -363,8 +363,7 @@
 static void TestPictureTypefaceSerialization(skiatest::Reporter* reporter) {
     {
         // Load typeface from file to test CreateFromFile with index.
-        auto data = GetResourceAsData("fonts/test.ttc");
-        auto typeface = SkTypeface::MakeFromStream(new SkMemoryStream(std::move(data)), 1);
+        auto typeface = MakeResourceAsTypeface("fonts/test.ttc", 1);
         if (!typeface) {
             INFOF(reporter, "Could not run fontstream test because test.ttc not found.");
         } else {