@shopify/react-native-skia 0.1.191 → 0.1.193

package/android/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.4.1)
 
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 17)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSK_GL -DSK_BUILD_FOR_ANDROID -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DON_ANDROID -DONANDROID")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSK_GL -DSK_GANESH -DSK_BUILD_FOR_ANDROID -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DON_ANDROID -DONANDROID")
 
 set (PACKAGE_NAME "rnskia")
 set (SKIA_LIB "skia")

package/android/build.gradle

@@ -278,6 +278,7 @@ if (ENABLE_PREFAB) {
         into "${project.buildDir}/headers/rnskia/"
         includeEmptyDirs = false
         include "**/*.h"
+        duplicatesStrategy = 'include'
         eachFile {
             String path = it.path
 

package/android/cpp/jni/JniPlatformContext.cpp

@@ -101,7 +101,7 @@ sk_sp<SkImage> JniPlatformContext::takeScreenshotFromViewTag(size_t tag) {
   // Create pixmap from pixels and make a copy of it so that
   // the SkImage owns its own pixels
   SkPixmap pm(skInfo, pixels, bmi.stride);
-  auto skImage = SkImage::MakeRasterCopy(pm);
+  auto skImage = SkImages::RasterFromPixmapCopy(pm);
 
   // Unlock pixels
   AndroidBitmap_unlockPixels(env, bitmap);

package/cpp/api/JsiSkColorFilter.h

@@ -23,23 +23,8 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkColorFilter>(std::move(context),
                                                     std::move(colorFilter)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "ColorFilter");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkColorFilter,
-                                                  __typename__))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkColorFilter> fromValue(jsi::Runtime &runtime,
-                                        const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkColorFilter>(runtime)
-        ->getObject();
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkColorFilter, "ColorFilter")
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkColorFilter, dispose))
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkContourMeasure.h

@@ -68,26 +68,12 @@ public:
     return JsiSkPath::toValue(runtime, getContext(), std::move(path));
   }
 
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "ContourMeasure");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkContourMeasure,
-                                                  __typename__))
+  EXPORT_JSI_API_TYPENAME(JsiSkContourMeasure, "ContourMeasure")
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkContourMeasure, getPosTan),
                        JSI_EXPORT_FUNC(JsiSkContourMeasure, length),
                        JSI_EXPORT_FUNC(JsiSkContourMeasure, isClosed),
-                       JSI_EXPORT_FUNC(JsiSkContourMeasure, getSegment))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkContourMeasure> fromValue(jsi::Runtime &runtime,
-                                           const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkContourMeasure>(runtime)
-        ->getObject();
-  }
+                       JSI_EXPORT_FUNC(JsiSkContourMeasure, getSegment),
+                       JSI_EXPORT_FUNC(JsiSkContourMeasure, dispose))
 };
 } // namespace RNSkia

package/cpp/api/JsiSkContourMeasureIter.h

@@ -29,14 +29,6 @@ public:
             std::move(context), std::make_shared<SkContourMeasureIter>(
                                     path, forceClosed, resScale)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "ContourMeasureIter");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkContourMeasureIter,
-                                                  __typename__), )
-
   JSI_HOST_FUNCTION(next) {
     auto next = getObject()->next();
     if (next == nullptr) {
@@ -48,17 +40,10 @@ public:
     return jsi::Object::createFromHostObject(runtime, std::move(nextObject));
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkContourMeasureIter, next))
+  EXPORT_JSI_API_TYPENAME(JsiSkContourMeasureIter, "ContourMeasureIter")
 
-  /**
-  Returns the underlying object from a host object of this type
- */
-  static std::shared_ptr<SkContourMeasureIter>
-  fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkContourMeasureIter>(runtime)
-        ->getObject();
-  }
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkContourMeasureIter, next),
+                       JSI_EXPORT_FUNC(JsiSkContourMeasureIter, dispose))
 
   /**
    * Creates the function for construction a new instance of the

package/cpp/api/JsiSkData.h

@@ -24,24 +24,7 @@ public:
   JsiSkData(std::shared_ptr<RNSkPlatformContext> context, sk_sp<SkData> asset)
       : JsiSkWrappingSkPtrHostObject(std::move(context), std::move(asset)) {}
 
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Data");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkData, __typename__))
-
-  JSI_HOST_FUNCTION(dispose) {
-    setObject(nullptr);
-    return jsi::Value::undefined();
-  }
-
+  EXPORT_JSI_API_TYPENAME(JsiSkData, "Data")
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkData, dispose))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkData> fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
-    return obj.asObject(runtime).asHostObject<JsiSkData>(runtime)->getObject();
-  }
 };
 } // namespace RNSkia

package/cpp/api/JsiSkFont.h

@@ -28,11 +28,6 @@ namespace jsi = facebook::jsi;
 
 class JsiSkFont : public JsiSkWrappingSharedPtrHostObject<SkFont> {
 public:
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Font");
-  }
-
   JSI_HOST_FUNCTION(getGlyphWidths) {
     auto jsiGlyphs = arguments[0].asObject(runtime).asArray(runtime);
     std::vector<SkGlyphID> glyphs;
@@ -244,6 +239,8 @@ public:
     return jsi::Value::undefined();
   }
 
+  EXPORT_JSI_API_TYPENAME(JsiSkFont, "Font")
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkFont, getSize),
                        JSI_EXPORT_FUNC(JsiSkFont, getMetrics),
                        JSI_EXPORT_FUNC(JsiSkFont, getGlyphIDs),
@@ -262,20 +259,13 @@ public:
                        JSI_EXPORT_FUNC(JsiSkFont, setSubpixel),
                        JSI_EXPORT_FUNC(JsiSkFont, setTypeface),
                        JSI_EXPORT_FUNC(JsiSkFont, getGlyphWidths),
-                       JSI_EXPORT_FUNC(JsiSkFont, getTextWidth))
+                       JSI_EXPORT_FUNC(JsiSkFont, getTextWidth),
+                       JSI_EXPORT_FUNC(JsiSkFont, dispose))
 
   JsiSkFont(std::shared_ptr<RNSkPlatformContext> context, const SkFont &font)
       : JsiSkWrappingSharedPtrHostObject(std::move(context),
                                          std::make_shared<SkFont>(font)) {}
 
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static std::shared_ptr<SkFont> fromValue(jsi::Runtime &runtime,
-                                           const jsi::Value &obj) {
-    return obj.asObject(runtime).asHostObject<JsiSkFont>(runtime)->getObject();
-  }
-
   /**
    * Creates the function for construction a new instance of the SkFont
    * wrapper

package/cpp/api/JsiSkHostObjects.h

@@ -11,7 +11,8 @@ namespace RNSkia {
 namespace jsi = facebook::jsi;
 
 /**
- * Base class for jsi host objects
+ * Base class for jsi host objects - these are all implemented as JsiHostObjects
+ * and has a pointer to the platform context.
  */
 class JsiSkHostObject : public RNJsi::JsiHostObject {
 public:
@@ -32,6 +33,15 @@ private:
   std::shared_ptr<RNSkPlatformContext> _context;
 };
 
+#define JSI_API_TYPENAME(A)                                                    \
+  JSI_PROPERTY_GET(__typename__) {                                             \
+    return jsi::String::createFromUtf8(runtime, #A);                           \
+  }
+
+#define EXPORT_JSI_API_TYPENAME(CLASS, TYPENAME)                               \
+  JSI_API_TYPENAME(TYPENAME)                                                   \
+  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(CLASS, __typename__))
+
 template <typename T> class JsiSkWrappingHostObject : public JsiSkHostObject {
 public:
   /**
@@ -39,32 +49,65 @@ public:
    * @param context Platform context
    */
   JsiSkWrappingHostObject(std::shared_ptr<RNSkPlatformContext> context,
-                          T &&object)
+                          T object)
       : JsiSkHostObject(std::move(context)), _object(std::move(object)) {}
 
-  JsiSkWrappingHostObject(std::shared_ptr<RNSkPlatformContext> context,
-                          const T &object)
-      : JsiSkHostObject(std::move(context)), _object(object) {}
-
   /**
    * Returns the underlying object exposed by this host object. This object
    * should be wrapped in a shared pointer of some kind
    * @return Underlying object
    */
-  T &getObject() { return _object; }
-  const T &getObject() const { return _object; }
+  T getObject() { return _object; }
+  const T getObject() const { return _object; }
 
   /**
    Updates the inner object with a new version of the object.
    */
-  void setObject(T &object) { _object = object; }
-  void setObject(const T &object) { _object = object; }
+  void setObject(T object) { _object = object; }
+
+  /**
+   Dispose function that can be exposed to JS by using the JSI_API_TYPENAME
+   macro
+   */
+  JSI_HOST_FUNCTION(dispose) {
+    safeDispose();
+    return jsi::Value::undefined();
+  }
+
+protected:
+  /**
+   Override to implement disposale of allocated resources like smart pointers
+   etc. This method will only be called once for each instance of this class.
+   */
+  virtual void releaseResources() = 0;
+
+  /**
+   Throws a runtime error if this method is called after the object has been
+   disposed.
+   */
+  void ensureNotDisposed() {
+    if (_isDisposed) {
+      throw std::runtime_error("API Object accessed after it was disposed");
+    }
+  }
 
 private:
+  void safeDispose() {
+    if (!_isDisposed) {
+      _isDisposed = true;
+      releaseResources();
+    }
+  }
+
   /**
    * Wrapped object
    */
   T _object;
+
+  /**
+   Resource disposed flag
+   */
+  std::atomic<bool> _isDisposed = {false};
 };
 
 template <typename T>
@@ -75,6 +118,22 @@ public:
                                    std::shared_ptr<T> object)
       : JsiSkWrappingHostObject<std::shared_ptr<T>>(std::move(context),
                                                     std::move(object)) {}
+
+  /**
+    Returns the underlying object from a host object of this type
+   */
+  static std::shared_ptr<T> fromValue(jsi::Runtime &runtime,
+                                      const jsi::Value &obj) {
+    return std::static_pointer_cast<JsiSkWrappingSharedPtrHostObject>(
+               obj.asObject(runtime).asHostObject(runtime))
+        ->getObject();
+  }
+
+protected:
+  void releaseResources() override {
+    // Clear internally allocated objects
+    this->setObject(nullptr);
+  }
 };
 
 template <typename T>
@@ -84,5 +143,21 @@ public:
                                sk_sp<T> object)
       : JsiSkWrappingHostObject<sk_sp<T>>(std::move(context),
                                           std::move(object)) {}
+
+  /**
+    Returns the underlying object from a host object of this type
+   */
+  static sk_sp<T> fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
+    return std::static_pointer_cast<JsiSkWrappingSkPtrHostObject>(
+               obj.asObject(runtime).asHostObject(runtime))
+        ->getObject();
+  }
+
+protected:
+  void releaseResources() override {
+    // Clear internally allocated objects
+    this->setObject(nullptr);
+  }
 };
+
 } // namespace RNSkia

package/cpp/api/JsiSkImage.h

@@ -14,7 +14,9 @@
 #include "SkBase64.h"
 #include "SkImage.h"
 #include "SkStream.h"
-#include <include/codec/SkCodec.h>
+#include "codec/SkEncodedImageFormat.h"
+#include "include/encode/SkJpegEncoder.h"
+#include "include/encode/SkPngEncoder.h"
 
 #pragma clang diagnostic pop
 
@@ -70,7 +72,15 @@ public:
     auto quality = count == 2 ? arguments[1].asNumber() : 100.0;
 
     // Get data
-    auto data = getObject()->encodeToData(format, quality);
+    sk_sp<SkData> data;
+    if (format == SkEncodedImageFormat::kJPEG) {
+      SkJpegEncoder::Options options;
+      options.fQuality = quality;
+      data = SkJpegEncoder::Encode(nullptr, getObject().get(), options);
+    } else {
+      SkPngEncoder::Options options;
+      data = SkPngEncoder::Encode(nullptr, getObject().get(), options);
+    }
     auto arrayCtor =
         runtime.global().getPropertyAsFunction(runtime, "Uint8Array");
     size_t size = data->size();
@@ -95,8 +105,19 @@ public:
                    : SkEncodedImageFormat::kPNG;
 
     auto quality = count == 2 ? arguments[1].asNumber() : 100.0;
-
-    auto data = getObject()->encodeToData(format, quality);
+    auto image = getObject();
+    if (image->isTextureBacked()) {
+      image = image->makeNonTextureImage();
+    }
+    sk_sp<SkData> data;
+    if (format == SkEncodedImageFormat::kJPEG) {
+      SkJpegEncoder::Options options;
+      options.fQuality = quality;
+      data = SkJpegEncoder::Encode(nullptr, image.get(), options);
+    } else {
+      SkPngEncoder::Options options;
+      data = SkPngEncoder::Encode(nullptr, image.get(), options);
+    }
     auto len = SkBase64::Encode(data->bytes(), data->size(), nullptr);
     auto buffer = std::string(len, 0);
     SkBase64::Encode(data->bytes(), data->size(),
@@ -110,10 +131,7 @@ public:
         runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
   }
 
-  JSI_HOST_FUNCTION(dispose) {
-    setObject(nullptr);
-    return jsi::Value::undefined();
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkImage, "Image")
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkImage, width),
                        JSI_EXPORT_FUNC(JsiSkImage, height),
@@ -128,14 +146,6 @@ public:
              const sk_sp<SkImage> image)
       : JsiSkWrappingSkPtrHostObject<SkImage>(std::move(context),
                                               std::move(image)) {}
-
-  /**
-  Returns the underlying object from a host object of this type
- */
-  static sk_sp<SkImage> fromValue(jsi::Runtime &runtime,
-                                  const jsi::Value &obj) {
-    return obj.asObject(runtime).asHostObject<JsiSkImage>(runtime)->getObject();
-  }
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkImageFactory.h

@@ -18,7 +18,7 @@ class JsiSkImageFactory : public JsiSkHostObject {
 public:
   JSI_HOST_FUNCTION(MakeImageFromEncoded) {
     auto data = JsiSkData::fromValue(runtime, arguments[0]);
-    auto image = SkImage::MakeFromEncoded(data);
+    auto image = SkImages::DeferredFromEncodedData(data);
     if (image == nullptr) {
       return jsi::Value::null();
     }
@@ -30,7 +30,7 @@ public:
     auto imageInfo = JsiSkImageInfo::fromValue(runtime, arguments[0]);
     auto pixelData = JsiSkData::fromValue(runtime, arguments[1]);
     auto bytesPerRow = arguments[2].asNumber();
-    auto image = SkImage::MakeRasterData(*imageInfo, pixelData, bytesPerRow);
+    auto image = SkImages::RasterFromData(*imageInfo, pixelData, bytesPerRow);
     if (image == nullptr) {
       return jsi::Value::null();
     }

package/cpp/api/JsiSkImageFilter.h

@@ -25,23 +25,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkImageFilter>(std::move(context),
                                                     std::move(imageFilter)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "ImageFilter");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkImageFilter,
-                                                  __typename__))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkImageFilter> fromValue(jsi::Runtime &runtime,
-                                        const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkImageFilter>(runtime)
-        ->getObject();
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkImageFilter, "ImageFilter")
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkMaskFilter.h

@@ -25,23 +25,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkMaskFilter>(std::move(context),
                                                    std::move(maskFilter)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "MaskFilter");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkMaskFilter,
-                                                  __typename__))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkMaskFilter> fromValue(jsi::Runtime &runtime,
-                                       const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkMaskFilter>(runtime)
-        ->getObject();
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkMaskFilter, "MaskFilter")
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkMatrix.h

@@ -40,10 +40,6 @@ public:
                              pers0, pers1, pers2);
   }
 
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Matrix");
-  }
-
   JSI_HOST_FUNCTION(concat) {
     auto m3 = JsiSkMatrix::fromValue(runtime, arguments[0]);
     getObject()->preConcat(*m3);
@@ -90,7 +86,7 @@ public:
     return values;
   }
 
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkMatrix, __typename__))
+  EXPORT_JSI_API_TYPENAME(JsiSkMatrix, "Matrix")
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkMatrix, concat),
                        JSI_EXPORT_FUNC(JsiSkMatrix, translate),
@@ -98,7 +94,8 @@ public:
                        JSI_EXPORT_FUNC(JsiSkMatrix, skew),
                        JSI_EXPORT_FUNC(JsiSkMatrix, rotate),
                        JSI_EXPORT_FUNC(JsiSkMatrix, identity),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, get), )
+                       JSI_EXPORT_FUNC(JsiSkMatrix, get),
+                       JSI_EXPORT_FUNC(JsiSkMatrix, dispose))
 
   /**
    * Returns the underlying object from a host object of this type

package/cpp/api/JsiSkPaint.h

@@ -25,12 +25,7 @@ namespace jsi = facebook::jsi;
 
 class JsiSkPaint : public JsiSkWrappingSharedPtrHostObject<SkPaint> {
 public:
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Paint");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPaint, __typename__))
+  EXPORT_JSI_API_TYPENAME(JsiSkPaint, "Paint")
 
   JSI_HOST_FUNCTION(copy) {
     const auto *paint = getObject().get();
@@ -183,7 +178,8 @@ public:
                        JSI_EXPORT_FUNC(JsiSkPaint, setStrokeWidth),
                        JSI_EXPORT_FUNC(JsiSkPaint, setStyle),
                        JSI_EXPORT_FUNC(JsiSkPaint, setColor),
-                       JSI_EXPORT_FUNC(JsiSkPaint, setAlphaf))
+                       JSI_EXPORT_FUNC(JsiSkPaint, setAlphaf),
+                       JSI_EXPORT_FUNC(JsiSkPaint, dispose))
 
   JsiSkPaint(std::shared_ptr<RNSkPlatformContext> context, SkPaint paint)
       : JsiSkWrappingSharedPtrHostObject<SkPaint>(
@@ -196,14 +192,6 @@ public:
     setObject(std::make_shared<SkPaint>(std::move(paint)));
   }
 
-  /**
-   Returns the underlying object from a host object of this type
- */
-  static std::shared_ptr<SkPaint> fromValue(jsi::Runtime &runtime,
-                                            const jsi::Value &obj) {
-    return obj.asObject(runtime).asHostObject<JsiSkPaint>(runtime)->getObject();
-  }
-
   /**
    * Creates the function for construction a new instance of the SkPaint
    * wrapper

package/cpp/api/JsiSkPath.h

@@ -7,6 +7,7 @@
 #include <jsi/jsi.h>
 
 #include "JsiSkHostObjects.h"
+#include "JsiSkMatrix.h"
 #include "JsiSkPoint.h"
 #include "JsiSkRRect.h"
 #include "JsiSkRect.h"
@@ -20,13 +21,12 @@
 #include "SkPathEffect.h"
 #include "SkPathOps.h"
 #include "SkPathTypes.h"
+#include "SkPathUtils.h"
 #include "SkString.h"
 #include "SkStrokeRec.h"
 #include "SkTextUtils.h"
 #include "SkTrimPathEffect.h"
 
-#include "JsiSkMatrix.h"
-
 #pragma clang diagnostic pop
 
 namespace RNSkia {
@@ -36,11 +36,6 @@ namespace jsi = facebook::jsi;
 class JsiSkPath : public JsiSkWrappingSharedPtrHostObject<SkPath> {
 
 public:
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Path");
-  }
-
   JSI_HOST_FUNCTION(addPath) {
     auto src = JsiSkPath::fromValue(runtime, arguments[0]);
     auto matrix =
@@ -289,8 +284,11 @@ public:
 
     auto jsiPrecision = opts.getProperty(runtime, "precision");
     auto precision = jsiPrecision.isUndefined() ? 1 : jsiPrecision.asNumber();
-    auto result = p.getFillPath(path, &path, nullptr, precision);
-    getObject()->swap(path);
+    auto result =
+        skpathutils::FillPathWithPaint(path, p, &path, nullptr, precision);
+    if (result) {
+      getObject()->swap(path);
+    }
     return result ? thisValue.getObject(runtime) : jsi::Value::null();
   }
 
@@ -325,8 +323,7 @@ public:
 
   JSI_HOST_FUNCTION(toSVGString) {
     SkPath path = *getObject();
-    SkString s;
-    SkParsePath::ToSVGString(path, &s);
+    auto s = SkParsePath::ToSVGString(path);
     return jsi::String::createFromUtf8(runtime, s.c_str());
   }
 
@@ -526,7 +523,7 @@ public:
     return cmds;
   }
 
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPath, __typename__))
+  EXPORT_JSI_API_TYPENAME(JsiSkPath, "Path")
 
   JSI_EXPORT_FUNCTIONS(
       JSI_EXPORT_FUNC(JsiSkPath, addPath), JSI_EXPORT_FUNC(JsiSkPath, addArc),
@@ -562,20 +559,12 @@ public:
       JSI_EXPORT_FUNC(JsiSkPath, op),
       JSI_EXPORT_FUNC(JsiSkPath, isInterpolatable),
       JSI_EXPORT_FUNC(JsiSkPath, interpolate),
-      JSI_EXPORT_FUNC(JsiSkPath, toCmds), )
+      JSI_EXPORT_FUNC(JsiSkPath, toCmds), JSI_EXPORT_FUNC(JsiSkPath, dispose))
 
   JsiSkPath(std::shared_ptr<RNSkPlatformContext> context, SkPath path)
       : JsiSkWrappingSharedPtrHostObject<SkPath>(
             std::move(context), std::make_shared<SkPath>(std::move(path))) {}
 
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static std::shared_ptr<SkPath> fromValue(jsi::Runtime &runtime,
-                                           const jsi::Value &obj) {
-    return obj.asObject(runtime).asHostObject<JsiSkPath>(runtime)->getObject();
-  }
-
   static jsi::Value toValue(jsi::Runtime &runtime,
                             std::shared_ptr<RNSkPlatformContext> context,
                             const SkPath &path) {

package/cpp/api/JsiSkPathEffect.h

@@ -25,23 +25,8 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkPathEffect>(std::move(context),
                                                    std::move(pathEffect)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "PathEffect");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPathEffect,
-                                                  __typename__))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkPathEffect> fromValue(jsi::Runtime &runtime,
-                                       const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkPathEffect>(runtime)
-        ->getObject();
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkPathEffect, "PathEffect")
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkColorFilter, dispose))
 };
 
 } // namespace RNSkia