commit 97b150e73b1f0136f2721a7a88dcd1088870a19d
author Florin Malita <fmalita@chromium.org> Thu Sep 27 10:59:52 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 27 16:22:25 2018 +0000
tree ae5f8db08efc0c89fc7fbcd3c8e6edc97e3ae4b0
parent f065907ccc0ae5e9258443b5a1bbabeef181e965

[skottie] External font loader tweaks

More general ResourceProvider font loading API:

1) font name argument
2) invoked unconditionally (regardless of whether an URL is present)

This provides more font control to the embedder.

Change-Id: I95557c75c2e0fe41ff68ee1b6cec8929405a74fc
Reviewed-on: https://skia-review.googlesource.com/157424
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>

modules/skottie/gm/SkottieGM.cpp

diff --git a/modules/skottie/gm/SkottieGM.cpp b/modules/skottie/gm/SkottieGM.cpp
index b99c337..229df62 100644
--- a/modules/skottie/gm/SkottieGM.cpp
+++ b/modules/skottie/gm/SkottieGM.cpp
@@ -27,7 +27,7 @@
 public:
     FakeWebFontProvider() : fFontData(GetResourceAsData(kWebFontResource)) {}
 
-    sk_sp<SkData> loadWebFont(const char[]) const {
+    sk_sp<SkData> loadFont(const char[], const char[]) const override {
         return fFontData;
     }