Merge pull request #2074 from Shopify/paragraph-builder

Fix substancial performance bottleneck fon ParagraphBuilderFactory

Author: wcandillon

package/cpp/api/JsiSkApi.h

@@ -25,6 +25,7 @@
 #include "JsiSkMatrix.h"
 #include "JsiSkPaint.h"
 #include "JsiSkParagraphBuilder.h"
+#include "JsiSkParagraphBuilderFactory.h"
 #include "JsiSkPath.h"
 #include "JsiSkPathEffect.h"
 #include "JsiSkPathEffectFactory.h"
@@ -62,7 +63,9 @@ class JsiSkApi : public JsiSkHostObject {
    */
   JsiSkApi(jsi::Runtime &runtime, std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkHostObject(context) {
-
+    // We create the system font manager eagerly since it has proven to be too
+    // slow to do it on demand
+    JsiSkFontMgrFactory::getFontMgr(getContext());
     installFunction("Font", JsiSkFont::createCtor(context));
     installFunction("Paint", JsiSkPaint::createCtor(context));
     installFunction("RSXform", JsiSkRSXform::createCtor(context));

package/cpp/api/JsiSkParagraphBuilder.h

@@ -7,6 +7,7 @@
 
 #include <JsiSkFont.h>
 #include <JsiSkFontMgr.h>
+#include <JsiSkFontMgrFactory.h>
 #include <JsiSkHostObjects.h>
 #include <JsiSkParagraph.h>
 #include <JsiSkParagraphStyle.h>
@@ -113,7 +114,8 @@ class JsiSkParagraphBuilder : public JsiSkHostObject {
                                  sk_sp<SkFontMgr> fontManager)
       : JsiSkHostObject(std::move(context)) {
     _fontCollection = sk_make_sp<para::FontCollection>();
-    _fontCollection->setDefaultFontManager(getContext()->createFontMgr());
+    auto fontMgr = JsiSkFontMgrFactory::getFontMgr(getContext());
+    _fontCollection->setDefaultFontManager(fontMgr);
     if (fontManager != nullptr) {
       _fontCollection->setAssetFontManager(fontManager);
     }
@@ -125,35 +127,4 @@ class JsiSkParagraphBuilder : public JsiSkHostObject {
   std::unique_ptr<para::ParagraphBuilder> _builder;
   sk_sp<para::FontCollection> _fontCollection;
 };
-
-/**
- Implementation of the ParagraphBuilderFactory for making ParagraphBuilder JSI
- object
- */
-class JsiSkParagraphBuilderFactory : public JsiSkHostObject {
-public:
-  JSI_HOST_FUNCTION(Make) {
-    // Get paragraph style from params
-    auto paragraphStyle =
-        count > 0 ? JsiSkParagraphStyle::fromValue(runtime, arguments[0])
-                  : para::ParagraphStyle();
-
-    // get font manager
-    auto fontMgr =
-        count > 1 ? JsiSkTypefaceFontProvider::fromValue(runtime, arguments[1])
-                  : nullptr;
-
-    // Create the paragraph builder
-    return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkParagraphBuilder>(
-                     getContext(), paragraphStyle, fontMgr));
-  }
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkParagraphBuilderFactory, Make))
-
-  explicit JsiSkParagraphBuilderFactory(
-      std::shared_ptr<RNSkPlatformContext> context)
-      : JsiSkHostObject(std::move(context)) {}
-};
-
 } // namespace RNSkia

package/cpp/api/JsiSkParagraphBuilderFactory.h

@@ -0,0 +1,54 @@
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include <jsi/jsi.h>
+
+#include <JsiSkParagraphBuilder.h>
+#include <JsiSkParagraphStyle.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "ParagraphBuilder.h"
+
+#pragma clang diagnostic pop
+
+namespace RNSkia {
+
+namespace jsi = facebook::jsi;
+
+namespace para = skia::textlayout;
+
+/**
+ Implementation of the ParagraphBuilderFactory for making ParagraphBuilder JSI
+ object
+ */
+class JsiSkParagraphBuilderFactory : public JsiSkHostObject {
+public:
+  JSI_HOST_FUNCTION(Make) {
+    // Get paragraph style from params
+    auto paragraphStyle =
+        count > 0 ? JsiSkParagraphStyle::fromValue(runtime, arguments[0])
+                  : para::ParagraphStyle();
+
+    // get font manager
+    auto fontMgr =
+        count > 1 ? JsiSkTypefaceFontProvider::fromValue(runtime, arguments[1])
+                  : nullptr;
+
+    // Create the paragraph builder
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkParagraphBuilder>(
+                     getContext(), paragraphStyle, fontMgr));
+  }
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkParagraphBuilderFactory, Make))
+
+  explicit JsiSkParagraphBuilderFactory(
+      std::shared_ptr<RNSkPlatformContext> context)
+      : JsiSkHostObject(std::move(context)) {}
+};
+
+} // namespace RNSkia