@shopify/react-native-skia 2.9.1 → 2.10.0

package/cpp/api/JsiSkCanvas.h

@@ -5,10 +5,10 @@
 #include <vector>
 
 #include "JsiSkFont.h"
-#include "JsiSkHostObjects.h"
 #include "JsiSkImage.h"
 #include "JsiSkImageInfo.h"
 #include "JsiSkMatrix.h"
+#include "JsiSkNativeObjects.h"
 #include "JsiSkPaint.h"
 #include "JsiSkPath.h"
 #include "JsiSkPicture.h"
@@ -49,8 +49,10 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkCanvas : public JsiSkHostObject {
+class JsiSkCanvas : public JsiSkNativeObject<JsiSkCanvas> {
 public:
+  static constexpr const char *CLASS_NAME = "Canvas";
+
   JSI_HOST_FUNCTION(drawPaint) {
     auto paint = JsiSkPaint::fromValue(runtime, arguments[0]);
     _canvas->drawPaint(*paint);
@@ -246,10 +248,8 @@ public:
   }
 
   JSI_HOST_FUNCTION(getTotalMatrix) {
-    auto matrix =
-        std::make_shared<JsiSkMatrix>(getContext(), _canvas->getTotalMatrix());
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, matrix,
-                                                       getContext());
+    return makeJsiObject(runtime, std::make_shared<JsiSkMatrix>(
+                                      getContext(), _canvas->getTotalMatrix()));
   }
 
   JSI_HOST_FUNCTION(drawPoints) {
@@ -651,9 +651,10 @@ public:
 #if defined(SK_GRAPHITE)
     // Graphite records draws lazily and offers no synchronous GPU readback. If
     // this canvas belongs to a surface, snap & submit its recording, snapshot
-    // it to a CPU raster image and read from that (mirroring makeImageSnapshot).
-    // A canvas without an owning surface (e.g. a picture-recording canvas) has
-    // no texture to read back, so fall through to the raster canvas read below.
+    // it to a CPU raster image and read from that (mirroring
+    // makeImageSnapshot). A canvas without an owning surface (e.g. a
+    // picture-recording canvas) has no texture to read back, so fall through to
+    // the raster canvas read below.
     if (_surface) {
       // Snapshot first: makeImageSnapshot records a copy task into the recorder
       // that must be submitted before the texture can be read back (this is the
@@ -663,8 +664,8 @@ public:
         DawnContext::getInstance().submitRecording(recorder->snap().get());
       }
       auto raster = DawnContext::getInstance().MakeRasterImage(snapshot);
-      if (!raster ||
-          !raster->readPixels(nullptr, *info, bfrPtr, bytesPerRow, srcX, srcY)) {
+      if (!raster || !raster->readPixels(nullptr, *info, bfrPtr, bytesPerRow,
+                                         srcX, srcY)) {
         return jsi::Value::null();
       }
       return dest;
@@ -677,55 +678,72 @@ public:
     return dest;
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkCanvas, drawPaint),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawLine),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawRect),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawImage),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawImageRect),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawImageCubic),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawImageOptions),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawImageNine),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawImageRectCubic),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawImageRectOptions),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawCircle),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawArc),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawRRect),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawDRRect),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawOval),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, restoreToCount),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, getSaveCount),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, getTotalMatrix),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawPoints),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawPatch),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawPath),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawVertices),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawText),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawTextBlob),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawGlyphs),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawSvg),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, clipPath),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, clipRect),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, clipRRect),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, save),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, saveLayer),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, restore),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, rotate),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, translate),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, scale),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, skew),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawColor),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, clear),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, concat),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawPicture),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, drawAtlas),
-                       JSI_EXPORT_FUNC(JsiSkCanvas, readPixels))
-
-  size_t getMemoryPressure() const override { return 1024; }
-
-  std::string getObjectType() const override { return "JsiSkCanvas"; }
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installHostMethod(runtime, prototype, "drawPaint", &JsiSkCanvas::drawPaint);
+    installHostMethod(runtime, prototype, "drawLine", &JsiSkCanvas::drawLine);
+    installHostMethod(runtime, prototype, "drawRect", &JsiSkCanvas::drawRect);
+    installHostMethod(runtime, prototype, "drawImage", &JsiSkCanvas::drawImage);
+    installHostMethod(runtime, prototype, "drawImageRect",
+                      &JsiSkCanvas::drawImageRect);
+    installHostMethod(runtime, prototype, "drawImageCubic",
+                      &JsiSkCanvas::drawImageCubic);
+    installHostMethod(runtime, prototype, "drawImageOptions",
+                      &JsiSkCanvas::drawImageOptions);
+    installHostMethod(runtime, prototype, "drawImageNine",
+                      &JsiSkCanvas::drawImageNine);
+    installHostMethod(runtime, prototype, "drawImageRectCubic",
+                      &JsiSkCanvas::drawImageRectCubic);
+    installHostMethod(runtime, prototype, "drawImageRectOptions",
+                      &JsiSkCanvas::drawImageRectOptions);
+    installHostMethod(runtime, prototype, "drawCircle",
+                      &JsiSkCanvas::drawCircle);
+    installHostMethod(runtime, prototype, "drawArc", &JsiSkCanvas::drawArc);
+    installHostMethod(runtime, prototype, "drawRRect", &JsiSkCanvas::drawRRect);
+    installHostMethod(runtime, prototype, "drawDRRect",
+                      &JsiSkCanvas::drawDRRect);
+    installHostMethod(runtime, prototype, "drawOval", &JsiSkCanvas::drawOval);
+    installHostMethod(runtime, prototype, "restoreToCount",
+                      &JsiSkCanvas::restoreToCount);
+    installHostMethod(runtime, prototype, "getSaveCount",
+                      &JsiSkCanvas::getSaveCount);
+    installHostMethod(runtime, prototype, "getTotalMatrix",
+                      &JsiSkCanvas::getTotalMatrix);
+    installHostMethod(runtime, prototype, "drawPoints",
+                      &JsiSkCanvas::drawPoints);
+    installHostMethod(runtime, prototype, "drawPatch", &JsiSkCanvas::drawPatch);
+    installHostMethod(runtime, prototype, "drawPath", &JsiSkCanvas::drawPath);
+    installHostMethod(runtime, prototype, "drawVertices",
+                      &JsiSkCanvas::drawVertices);
+    installHostMethod(runtime, prototype, "drawText", &JsiSkCanvas::drawText);
+    installHostMethod(runtime, prototype, "drawTextBlob",
+                      &JsiSkCanvas::drawTextBlob);
+    installHostMethod(runtime, prototype, "drawGlyphs",
+                      &JsiSkCanvas::drawGlyphs);
+    installHostMethod(runtime, prototype, "drawSvg", &JsiSkCanvas::drawSvg);
+    installHostMethod(runtime, prototype, "clipPath", &JsiSkCanvas::clipPath);
+    installHostMethod(runtime, prototype, "clipRect", &JsiSkCanvas::clipRect);
+    installHostMethod(runtime, prototype, "clipRRect", &JsiSkCanvas::clipRRect);
+    installHostMethod(runtime, prototype, "save", &JsiSkCanvas::save);
+    installHostMethod(runtime, prototype, "saveLayer", &JsiSkCanvas::saveLayer);
+    installHostMethod(runtime, prototype, "restore", &JsiSkCanvas::restore);
+    installHostMethod(runtime, prototype, "rotate", &JsiSkCanvas::rotate);
+    installHostMethod(runtime, prototype, "translate", &JsiSkCanvas::translate);
+    installHostMethod(runtime, prototype, "scale", &JsiSkCanvas::scale);
+    installHostMethod(runtime, prototype, "skew", &JsiSkCanvas::skew);
+    installHostMethod(runtime, prototype, "drawColor", &JsiSkCanvas::drawColor);
+    installHostMethod(runtime, prototype, "clear", &JsiSkCanvas::clear);
+    installHostMethod(runtime, prototype, "concat", &JsiSkCanvas::concat);
+    installHostMethod(runtime, prototype, "drawPicture",
+                      &JsiSkCanvas::drawPicture);
+    installHostMethod(runtime, prototype, "drawAtlas", &JsiSkCanvas::drawAtlas);
+    installHostMethod(runtime, prototype, "readPixels",
+                      &JsiSkCanvas::readPixels);
+  }
+
+  size_t getMemoryPressure() override { return 1024; }
 
   explicit JsiSkCanvas(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiSkHostObject(std::move(context)) {}
+      : JsiSkNativeObject<JsiSkCanvas>(std::move(context)) {}
 
   JsiSkCanvas(std::shared_ptr<RNSkPlatformContext> context, SkCanvas *canvas)
       : JsiSkCanvas(std::move(context)) {

package/cpp/api/JsiSkColor.h

@@ -6,7 +6,7 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 #include "api/third_party/CSSColorParser.h"
 
 #pragma clang diagnostic push
@@ -20,11 +20,13 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkColor : public RNJsi::JsiHostObject {
+/**
+ * JsiSkColor is a pure utility class — colors are represented as
+ * Float32Arrays on the JS side, so there is no wrapper object.
+ */
+class JsiSkColor {
 public:
-  JsiSkColor() : JsiHostObject() {}
-
-  ~JsiSkColor() override = default;
+  JsiSkColor() = default;
 
   static jsi::Object toValue(jsi::Runtime &runtime, SkColor color) {
     auto result = runtime.global()

package/cpp/api/JsiSkColorFilter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 #include <jsi/jsi.h>
 #include <memory>
 #include <utility>
@@ -16,19 +16,26 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkColorFilter : public JsiSkWrappingSkPtrHostObject<SkColorFilter> {
+class JsiSkColorFilter
+    : public JsiSkWrappingSkPtrNativeObject<JsiSkColorFilter, SkColorFilter> {
 public:
+  static constexpr const char *CLASS_NAME = "ColorFilter";
+
   JsiSkColorFilter(std::shared_ptr<RNSkPlatformContext> context,
                    sk_sp<SkColorFilter> colorFilter)
-      : JsiSkWrappingSkPtrHostObject<SkColorFilter>(std::move(context),
-                                                    std::move(colorFilter)) {}
+      : JsiSkWrappingSkPtrNativeObject<JsiSkColorFilter, SkColorFilter>(
+            std::move(context), std::move(colorFilter)) {}
 
-  size_t getMemoryPressure() const override { return 2048; }
+  size_t getMemoryPressure() override { return 2048; }
 
-  std::string getObjectType() const override { return "JsiSkColorFilter"; }
+  static sk_sp<SkColorFilter> fromValue(jsi::Runtime &runtime,
+                                        const jsi::Value &obj) {
+    return objectFromValue(runtime, obj);
+  }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkColorFilter, ColorFilter)
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkColorFilter, dispose))
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+  }
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkColorFilterFactory.h

@@ -2,7 +2,7 @@
 
 #include "JsiSkColor.h"
 #include "JsiSkColorFilter.h"
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 #include <jsi/jsi.h>
 #include <memory>
 #include <utility>
@@ -19,8 +19,11 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkColorFilterFactory : public JsiSkHostObject {
+class JsiSkColorFilterFactory
+    : public JsiSkNativeObject<JsiSkColorFilterFactory> {
 public:
+  static constexpr const char *CLASS_NAME = "ColorFilterFactory";
+
   JSI_HOST_FUNCTION(MakeMatrix) {
     auto jsiMatrix = arguments[0].asObject(runtime).asArray(runtime);
     float matrix[20];
@@ -30,31 +33,28 @@ public:
       }
     }
     // Return the newly constructed object
-    auto colorFilter = std::make_shared<JsiSkColorFilter>(
-        getContext(), SkColorFilters::Matrix(std::move(matrix)));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, colorFilter,
-                                                       getContext());
+    return makeJsiObject(
+        runtime, std::make_shared<JsiSkColorFilter>(
+                     getContext(), SkColorFilters::Matrix(std::move(matrix))));
   }
 
   JSI_HOST_FUNCTION(MakeBlend) {
     auto color = JsiSkColor::fromValue(runtime, arguments[0]);
     SkBlendMode blend = (SkBlendMode)arguments[1].asNumber();
     // Return the newly constructed object
-    auto colorFilter = std::make_shared<JsiSkColorFilter>(
-        getContext(), SkColorFilters::Blend(color, blend));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, colorFilter,
-                                                       getContext());
+    return makeJsiObject(
+        runtime, std::make_shared<JsiSkColorFilter>(
+                     getContext(), SkColorFilters::Blend(color, blend)));
   }
 
   JSI_HOST_FUNCTION(MakeCompose) {
     auto outer = JsiSkColorFilter::fromValue(runtime, arguments[0]);
     auto inner = JsiSkColorFilter::fromValue(runtime, arguments[1]);
     // Return the newly constructed object
-    auto colorFilter = std::make_shared<JsiSkColorFilter>(
-        getContext(),
-        SkColorFilters::Compose(std::move(outer), std::move(inner)));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, colorFilter,
-                                                       getContext());
+    return makeJsiObject(
+        runtime, std::make_shared<JsiSkColorFilter>(
+                     getContext(), SkColorFilters::Compose(std::move(outer),
+                                                           std::move(inner))));
   }
 
   JSI_HOST_FUNCTION(MakeLerp) {
@@ -62,52 +62,52 @@ public:
     auto dst = JsiSkColorFilter::fromValue(runtime, arguments[1]);
     auto src = JsiSkColorFilter::fromValue(runtime, arguments[2]);
     // Return the newly constructed object
-    auto colorFilter = std::make_shared<JsiSkColorFilter>(
-        getContext(), SkColorFilters::Lerp(t, std::move(dst), std::move(src)));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, colorFilter,
-                                                       getContext());
+    return makeJsiObject(
+        runtime, std::make_shared<JsiSkColorFilter>(
+                     getContext(),
+                     SkColorFilters::Lerp(t, std::move(dst), std::move(src))));
   }
 
   JSI_HOST_FUNCTION(MakeSRGBToLinearGamma) {
     // Return the newly constructed object
-    auto colorFilter = std::make_shared<JsiSkColorFilter>(
-        getContext(), SkColorFilters::SRGBToLinearGamma());
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, colorFilter,
-                                                       getContext());
+    return makeJsiObject(
+        runtime, std::make_shared<JsiSkColorFilter>(
+                     getContext(), SkColorFilters::SRGBToLinearGamma()));
   }
 
   JSI_HOST_FUNCTION(MakeLinearToSRGBGamma) {
     // Return the newly constructed object
-    auto colorFilter = std::make_shared<JsiSkColorFilter>(
-        getContext(), SkColorFilters::LinearToSRGBGamma());
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, colorFilter,
-                                                       getContext());
+    return makeJsiObject(
+        runtime, std::make_shared<JsiSkColorFilter>(
+                     getContext(), SkColorFilters::LinearToSRGBGamma()));
   }
 
   JSI_HOST_FUNCTION(MakeLumaColorFilter) {
     // Return the newly constructed object
-    auto colorFilter = std::make_shared<JsiSkColorFilter>(
-        getContext(), SkLumaColorFilter::Make());
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, colorFilter,
-                                                       getContext());
+    return makeJsiObject(runtime, std::make_shared<JsiSkColorFilter>(
+                                      getContext(), SkLumaColorFilter::Make()));
   }
 
-  size_t getMemoryPressure() const override { return 1024; }
-
-  std::string getObjectType() const override {
-    return "JsiSkColorFilterFactory";
+  size_t getMemoryPressure() override { return 1024; }
+
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installHostMethod(runtime, prototype, "MakeMatrix",
+                      &JsiSkColorFilterFactory::MakeMatrix);
+    installHostMethod(runtime, prototype, "MakeBlend",
+                      &JsiSkColorFilterFactory::MakeBlend);
+    installHostMethod(runtime, prototype, "MakeCompose",
+                      &JsiSkColorFilterFactory::MakeCompose);
+    installHostMethod(runtime, prototype, "MakeLerp",
+                      &JsiSkColorFilterFactory::MakeLerp);
+    installHostMethod(runtime, prototype, "MakeSRGBToLinearGamma",
+                      &JsiSkColorFilterFactory::MakeSRGBToLinearGamma);
+    installHostMethod(runtime, prototype, "MakeLinearToSRGBGamma",
+                      &JsiSkColorFilterFactory::MakeLinearToSRGBGamma);
+    installHostMethod(runtime, prototype, "MakeLumaColorFilter",
+                      &JsiSkColorFilterFactory::MakeLumaColorFilter);
   }
 
-  JSI_EXPORT_FUNCTIONS(
-      JSI_EXPORT_FUNC(JsiSkColorFilterFactory, MakeMatrix),
-      JSI_EXPORT_FUNC(JsiSkColorFilterFactory, MakeBlend),
-      JSI_EXPORT_FUNC(JsiSkColorFilterFactory, MakeCompose),
-      JSI_EXPORT_FUNC(JsiSkColorFilterFactory, MakeLerp),
-      JSI_EXPORT_FUNC(JsiSkColorFilterFactory, MakeSRGBToLinearGamma),
-      JSI_EXPORT_FUNC(JsiSkColorFilterFactory, MakeLinearToSRGBGamma),
-      JSI_EXPORT_FUNC(JsiSkColorFilterFactory, MakeLumaColorFilter))
-
   explicit JsiSkColorFilterFactory(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiSkHostObject(std::move(context)) {}
+      : JsiSkNativeObject<JsiSkColorFilterFactory>(std::move(context)) {}
 };
 } // namespace RNSkia

package/cpp/api/JsiSkContourMeasure.h

@@ -5,7 +5,7 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -21,12 +21,15 @@ namespace RNSkia {
 namespace jsi = facebook::jsi;
 
 class JsiSkContourMeasure
-    : public JsiSkWrappingSkPtrHostObject<SkContourMeasure> {
+    : public JsiSkWrappingSkPtrNativeObject<JsiSkContourMeasure,
+                                            SkContourMeasure> {
 public:
+  static constexpr const char *CLASS_NAME = "ContourMeasure";
+
   JsiSkContourMeasure(std::shared_ptr<RNSkPlatformContext> context,
                       const sk_sp<SkContourMeasure> contourMeasure)
-      : JsiSkWrappingSkPtrHostObject(std::move(context),
-                                     std::move(contourMeasure)) {}
+      : JsiSkWrappingSkPtrNativeObject<JsiSkContourMeasure, SkContourMeasure>(
+            std::move(context), std::move(contourMeasure)) {}
 
   JSI_HOST_FUNCTION(getPosTan) {
     auto dist = arguments[0].asNumber();
@@ -37,12 +40,10 @@ public:
       throw jsi::JSError(runtime, "getPosTan() failed");
     }
     auto posTan = jsi::Array(runtime, 2);
-    auto posPoint = std::make_shared<JsiSkPoint>(getContext(), position);
-    auto pos = JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, posPoint,
-                                                           getContext());
-    auto tanPoint = std::make_shared<JsiSkPoint>(getContext(), tangent);
-    auto tan = JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, tanPoint,
-                                                           getContext());
+    auto pos = makeJsiObject(
+        runtime, std::make_shared<JsiSkPoint>(getContext(), position));
+    auto tan = makeJsiObject(
+        runtime, std::make_shared<JsiSkPoint>(getContext(), tangent));
     posTan.setValueAtIndex(runtime, 0, pos);
     posTan.setValueAtIndex(runtime, 1, tan);
     return posTan;
@@ -67,16 +68,18 @@ public:
     return JsiSkPath::toValue(runtime, getContext(), builder.snapshot());
   }
 
-  size_t getMemoryPressure() const override { return 1024; }
-
-  std::string getObjectType() const override { return "JsiSkContourMeasure"; }
-
-  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),
-                       JSI_EXPORT_FUNC(JsiSkContourMeasure, dispose))
+  size_t getMemoryPressure() override { return 1024; }
+
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+    installHostMethod(runtime, prototype, "getPosTan",
+                      &JsiSkContourMeasure::getPosTan);
+    installHostMethod(runtime, prototype, "length",
+                      &JsiSkContourMeasure::length);
+    installHostMethod(runtime, prototype, "isClosed",
+                      &JsiSkContourMeasure::isClosed);
+    installHostMethod(runtime, prototype, "getSegment",
+                      &JsiSkContourMeasure::getSegment);
+  }
 };
 } // namespace RNSkia

package/cpp/api/JsiSkContourMeasureIter.h

@@ -4,7 +4,7 @@
 #include <utility>
 
 #include "JsiSkContourMeasure.h"
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -20,12 +20,16 @@ namespace RNSkia {
 namespace jsi = facebook::jsi;
 
 class JsiSkContourMeasureIter
-    : public JsiSkWrappingSharedPtrHostObject<SkContourMeasureIter> {
+    : public JsiSkWrappingSharedPtrNativeObject<JsiSkContourMeasureIter,
+                                                SkContourMeasureIter> {
 public:
+  static constexpr const char *CLASS_NAME = "ContourMeasureIter";
+
   JsiSkContourMeasureIter(std::shared_ptr<RNSkPlatformContext> context,
                           const SkPath &path, bool forceClosed,
                           SkScalar resScale = 1)
-      : JsiSkWrappingSharedPtrHostObject<SkContourMeasureIter>(
+      : JsiSkWrappingSharedPtrNativeObject<JsiSkContourMeasureIter,
+                                           SkContourMeasureIter>(
             std::move(context), std::make_shared<SkContourMeasureIter>(
                                     path, forceClosed, resScale)) {}
 
@@ -34,24 +38,18 @@ public:
     if (next == nullptr) {
       return jsi::Value::undefined();
     }
-    auto nextObject =
-        std::make_shared<JsiSkContourMeasure>(getContext(), std::move(next));
-
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, nextObject,
-                                                       getContext());
+    return makeJsiObject(runtime, std::make_shared<JsiSkContourMeasure>(
+                                      getContext(), std::move(next)));
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkContourMeasureIter, ContourMeasureIter)
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkContourMeasureIter, next),
-                       JSI_EXPORT_FUNC(JsiSkContourMeasureIter, dispose))
-
-  size_t getMemoryPressure() const override {
-    return std::max(sizeof(SkContourMeasureIter), kMinMemoryPressure);
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+    installHostMethod(runtime, prototype, "next",
+                      &JsiSkContourMeasureIter::next);
   }
 
-  std::string getObjectType() const override {
-    return "JsiSkContourMeasureIter";
+  size_t getMemoryPressure() override {
+    return std::max(sizeof(SkContourMeasureIter), kMinMemoryPressure);
   }
 
   /**
@@ -68,10 +66,9 @@ public:
       auto forceClosed = arguments[1].getBool();
       auto resScale = arguments[2].asNumber();
       // Return the newly constructed object
-      auto iter = std::make_shared<JsiSkContourMeasureIter>(
-          std::move(context), path->snapshot(), forceClosed, resScale);
-      return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, iter,
-                                                         context);
+      return makeJsiObject(runtime, std::make_shared<JsiSkContourMeasureIter>(
+                                        std::move(context), path->snapshot(),
+                                        forceClosed, resScale));
     };
   }
 };

package/cpp/api/JsiSkData.h

@@ -5,7 +5,7 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -19,19 +19,25 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkData : public JsiSkWrappingSkPtrHostObject<SkData> {
+class JsiSkData : public JsiSkWrappingSkPtrNativeObject<JsiSkData, SkData> {
 public:
+  static constexpr const char *CLASS_NAME = "Data";
+
   JsiSkData(std::shared_ptr<RNSkPlatformContext> context, sk_sp<SkData> asset)
-      : JsiSkWrappingSkPtrHostObject(std::move(context), std::move(asset)) {}
+      : JsiSkWrappingSkPtrNativeObject<JsiSkData, SkData>(std::move(context),
+                                                          std::move(asset)) {}
 
-  size_t getMemoryPressure() const override {
+  size_t getMemoryPressure() override {
     auto data = getObject();
     return data ? data->size() : 0;
   }
 
-  std::string getObjectType() const override { return "JsiSkData"; }
+  static sk_sp<SkData> fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
+    return objectFromValue(runtime, obj);
+  }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkData, Data)
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkData, dispose))
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+  }
 };
 } // namespace RNSkia