[sk4d] Improve backward compatibility for svg and lottie rendering texts

See skia4delphi/skia4delphi#415

Author: viniciusfbb

sk4d/modules/skottie/src/sk4d_skottie.cpp

@@ -8,10 +8,12 @@
 
 #include <utility>
 
+#include "src/sk4d_comp.h"
 #include "src/utils/SkOSPath.h"
 #include "modules/skottie/include/sk4d_skottie.h"
 #include "modules/skottie/src/sk4d_skottie_mapping.h"
 #include "modules/skresources/src/sk4d_resources_mapping.h"
+#include "modules/skshaper/utils/FactoryHelpers.h"
 
 double sk4d_skottieanimation_get_duration(const sk_skottieanimation_t* self) {
     return AsSkottieAnimation(self)->duration();
@@ -42,12 +44,14 @@ sk_skottieanimation_t* sk4d_skottieanimation_make_from_file(const char file_name
     if (!stream)
         return nullptr;
     auto rp = skresources::DataURIResourceProviderProxy::Make(skresources::FileResourceProvider::Make(SkOSPath::Dirname(file_name), skresources::ImageDecodeStrategy::kPreDecode), skresources::ImageDecodeStrategy::kPreDecode);
-    return ToSkottieAnimation(skottie::Animation::Builder().setResourceProvider(std::move(rp)).setFontManager(sk_ref_sp(AsFontMgr(font_provider))).make(stream.get()).release());
+    return ToSkottieAnimation(skottie::Animation::Builder().setResourceProvider(std::move(rp)).setFontManager(Sk4DComp::CustomFontMgrWithSystemFonts(sk_ref_sp(AsFontMgr(font_provider))))
+                              .setTextShapingFactory(SkShapers::BestAvailable()).make(stream.get()).release());
 }
 
 sk_skottieanimation_t* sk4d_skottieanimation_make_from_stream(sk_stream_t* stream, sk_resourceprovider_t* resource_provider, sk_fontmgr_t* font_provider) {
     auto rp = skresources::DataURIResourceProviderProxy::Make(sk_ref_sp(AsResourceProvider(resource_provider)), skresources::ImageDecodeStrategy::kPreDecode);
-    return ToSkottieAnimation(skottie::Animation::Builder().setResourceProvider(std::move(rp)).setFontManager(sk_ref_sp(AsFontMgr(font_provider))).make(AsStream(stream)).release());
+    return ToSkottieAnimation(skottie::Animation::Builder().setResourceProvider(std::move(rp)).setFontManager(Sk4DComp::CustomFontMgrWithSystemFonts(sk_ref_sp(AsFontMgr(font_provider))))
+                              .setTextShapingFactory(SkShapers::BestAvailable()).make(AsStream(stream)).release());
 }
 
 void sk4d_skottieanimation_ref(const sk_skottieanimation_t* self) {

sk4d/modules/svg/src/sk4d_svgdom.cpp

@@ -9,8 +9,10 @@
 #include <utility>
 
 #include "src/utils/SkOSPath.h"
+#include "src/sk4d_comp.h"
 #include "modules/svg/include/sk4d_svgdom.h"
 #include "modules/skresources/src/sk4d_resources_mapping.h"
+#include "modules/skshaper/utils/FactoryHelpers.h"
 #include "modules/svg/src/sk4d_svg_mapping.h"
 
 sk_svgnode_t* sk4d_svgdom_find_node_by_id(sk_svgdom_t* self, const char id[]) {
@@ -27,12 +29,14 @@ sk_svgdom_t* sk4d_svgdom_make_from_file(const char file_name[], sk_fontmgr_t* fo
     if (!stream)
         return nullptr;
     auto rp = skresources::DataURIResourceProviderProxy::Make(skresources::FileResourceProvider::Make(SkOSPath::Dirname(file_name), skresources::ImageDecodeStrategy::kPreDecode), skresources::ImageDecodeStrategy::kPreDecode);
-    return ToSVGDOM(SkSVGDOM::Builder().setResourceProvider(std::move(rp)).setFontManager(sk_ref_sp(AsFontMgr(font_provider))).make(*stream).release());
+    return ToSVGDOM(SkSVGDOM::Builder().setResourceProvider(std::move(rp)).setFontManager(Sk4DComp::CustomFontMgrWithSystemFonts(sk_ref_sp(AsFontMgr(font_provider))))
+                    .setTextShapingFactory(SkShapers::BestAvailable()).make(*stream).release());
 }
 
 sk_svgdom_t* sk4d_svgdom_make_from_stream(sk_stream_t* stream, sk_resourceprovider_t* resource_provider, sk_fontmgr_t* font_provider) {
     auto rp = skresources::DataURIResourceProviderProxy::Make(sk_ref_sp(AsResourceProvider(resource_provider)), skresources::ImageDecodeStrategy::kPreDecode);
-    return ToSVGDOM(SkSVGDOM::Builder().setResourceProvider(std::move(rp)).setFontManager(sk_ref_sp(AsFontMgr(font_provider))).make(AsStream(*stream)).release());
+    return ToSVGDOM(SkSVGDOM::Builder().setResourceProvider(std::move(rp)).setFontManager(Sk4DComp::CustomFontMgrWithSystemFonts(sk_ref_sp(AsFontMgr(font_provider))))
+                    .setTextShapingFactory(SkShapers::BestAvailable()).make(AsStream(*stream)).release());
 }
 
 void sk4d_svgdom_render(const sk_svgdom_t* self, sk_canvas_t* canvas) {

sk4d/src/sk4d_comp.cpp

@@ -2,6 +2,7 @@
 
 #include <mutex>
 #include "include/core/SkFontStyle.h"
+#include "include/utils/SkOrderedFontMgr.h"
 
 #if defined(SK_BUILD_FOR_WIN) && (defined(SK_FONTMGR_GDI_AVAILABLE) || \
                                   defined(SK_FONTMGR_DIRECTWRITE_AVAILABLE))
@@ -52,6 +53,17 @@
 #include "modules/skunicode/include/SkUnicode_icu4x.h"
 #endif
 
+sk_sp<SkFontMgr>
+Sk4DComp::CustomFontMgrWithSystemFonts(sk_sp<SkFontMgr> customFontManager) {
+    if (customFontManager) {
+        sk_sp<SkOrderedFontMgr> result(new SkOrderedFontMgr);
+        result->append(Sk4DComp::FontMgrRefDefault());
+        result->append(customFontManager);
+        return result;
+    }
+    return Sk4DComp::FontMgrRefDefault();
+}
+
 sk_sp<SkFontMgr> Sk4DComp::FontMgrRefDefault() {
     static std::once_flag once;
     static sk_sp<SkFontMgr> singleton;

sk4d/src/sk4d_comp.h

@@ -15,6 +15,7 @@
 
 namespace Sk4DComp {
 
+sk_sp<SkFontMgr> CustomFontMgrWithSystemFonts(sk_sp<SkFontMgr> customFontManager);
 sk_sp<SkFontMgr> FontMgrRefDefault();
 sk_sp<SkTypeface> MakeDefaultTypeface();
 sk_sp<SkUnicode> UnicodeMake();