commit 37b6109cde2b50d366d5f6ac38cc1c043081230d
author Bruce Wang <brucewang@google.com> Wed Jun 20 16:43:02 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 21 16:32:28 2018 +0000
tree 50615bcd8368deace45474f7df8f1a89b6736b01
parent ae167ed72e9319abdac28fb5e80089a00ae85f01

Implement onMakeClone(const SkFontArguments& args) in class SkTypeface_AndroidSystem.

Add FontMgrAndroidSystemVariableTypeface test to test the above
function.

Change-Id: I36a2f65550784a86feecc6ef69a870a33e973804
Reviewed-on: https://skia-review.googlesource.com/136248
Commit-Queue: Bruce Wang <brucewang@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

src/ports/SkFontMgr_android.cpp

diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp
index 5194e1f..a7cbd97 100644
--- a/src/ports/SkFontMgr_android.cpp
+++ b/src/ports/SkFontMgr_android.cpp
@@ -98,6 +98,22 @@
         return skstd::make_unique<SkFontData>(this->makeStream(), fIndex,
                                               fAxes.begin(), fAxes.count());
     }
+    sk_sp<SkTypeface> onMakeClone(const SkFontArguments& args) const override {
+        std::unique_ptr<SkFontData> data = this->cloneFontData(args);
+        if (!data) {
+            return nullptr;
+        }
+        return sk_make_sp<SkTypeface_AndroidSystem>(fPathName,
+                                                    fFile,
+                                                    fIndex,
+                                                    data->getAxis(),
+                                                    data->getAxisCount(),
+                                                    this->fontStyle(),
+                                                    this->isFixedPitch(),
+                                                    fFamilyName,
+                                                    fLang,
+                                                    fVariantStyle);
+    }
 
     const SkString fPathName;
     int fIndex;