@shopify/react-native-skia 2.4.17 → 2.4.19

package/cpp/api/JsiSkHostObjects.h

@@ -126,8 +126,8 @@ public:
    * Throws if the object has been disposed.
    * @return Underlying object
    */
-  T getObject() { return _object; }
-  const T getObject() const { return _object; }
+  T getObject() { return validateObject(); }
+  const T getObject() const { return validateObject(); }
 
   /**
    * Updates the inner object with a new version of the object.
@@ -139,15 +139,57 @@ public:
    * macro.
    */
   JSI_HOST_FUNCTION(dispose) {
-    // This is a no-op on native
+    safeDispose();
     return jsi::Value::undefined();
   }
 
+protected:
+  /**
+   * Override to implement disposal of allocated resources like smart pointers.
+   * This method will only be called once for each instance of this class.
+   */
+  virtual void releaseResources() = 0;
+
+  /**
+   * Returns true if the object has been disposed.
+   */
+  bool isDisposed() const { return _isDisposed.load(std::memory_order_acquire); }
+
+  /**
+   * Returns the underlying object without checking if disposed.
+   * Use this in destructors and releaseResources() where we need to access
+   * the object even after dispose() was called.
+   */
+  T getObjectUnchecked() const { return _object; }
+
 private:
+  /**
+   * Validates that _object was not disposed and returns it.
+   */
+  T validateObject() const {
+    if (_isDisposed.load(std::memory_order_acquire)) {
+      throw std::runtime_error("Attempted to access a disposed object.");
+    }
+    return _object;
+  }
+
+  void safeDispose() {
+    bool expected = false;
+    if (_isDisposed.compare_exchange_strong(expected, true,
+                                            std::memory_order_acq_rel)) {
+      releaseResources();
+    }
+  }
+
   /**
    * Wrapped object.
    */
   T _object;
+
+  /**
+   * Resource disposed flag.
+   */
+  std::atomic<bool> _isDisposed = {false};
 };
 
 template <typename T>
@@ -168,6 +210,12 @@ public:
                obj.asObject(runtime).asHostObject(runtime))
         ->getObject();
   }
+
+protected:
+  void releaseResources() override {
+    // Clear internally allocated objects
+    this->setObject(nullptr);
+  }
 };
 
 template <typename T>
@@ -186,6 +234,12 @@ public:
                obj.asObject(runtime).asHostObject(runtime))
         ->getObject();
   }
+
+protected:
+  void releaseResources() override {
+    // Clear internally allocated objects
+    this->setObject(nullptr);
+  }
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkImage.h

@@ -293,20 +293,34 @@ public:
     _dispatcher->processQueue();
   }
 
-  ~JsiSkImage() override {
+protected:
+  void releaseResources() override {
     // Queue deletion on the creation thread if needed
-    auto image = getObject();
+    auto image = getObjectUnchecked();
     if (image && _dispatcher) {
       _dispatcher->run([image]() {
         // Image will be deleted when this lambda is destroyed
       });
     }
-    // Clear the object to prevent base class destructor from deleting it
-    setObject(nullptr);
+    // Clear the object
+    JsiSkWrappingSkPtrHostObject<SkImage>::releaseResources();
+  }
+
+public:
+  ~JsiSkImage() override {
+    // If already disposed, resources were already cleaned up
+    if (isDisposed()) {
+      return;
+    }
+    // Use the same cleanup path as dispose()
+    releaseResources();
   }
 
   size_t getMemoryPressure() const override {
-    auto image = getObject();
+    if (isDisposed()) {
+      return 0;
+    }
+    auto image = getObjectUnchecked();
     if (image) {
       if (image->isTextureBacked()) {
         return image->textureSize();

package/cpp/api/JsiSkPicture.h

@@ -34,16 +34,27 @@ public:
     _dispatcher->processQueue();
   }
 
-  ~JsiSkPicture() override {
+protected:
+  void releaseResources() override {
     // Queue deletion on the creation thread if needed
-    auto picture = getObject();
+    auto picture = getObjectUnchecked();
     if (picture && _dispatcher) {
       _dispatcher->run([picture]() {
         // Picture will be deleted when this lambda is destroyed
       });
     }
-    // Clear the object to prevent base class destructor from deleting it
-    setObject(nullptr);
+    // Clear the object
+    JsiSkWrappingSkPtrHostObject<SkPicture>::releaseResources();
+  }
+
+public:
+  ~JsiSkPicture() override {
+    // If already disposed, resources were already cleaned up
+    if (isDisposed()) {
+      return;
+    }
+    // Use the same cleanup path as dispose()
+    releaseResources();
   }
 
   JSI_HOST_FUNCTION(makeShader) {
@@ -91,7 +102,10 @@ public:
                        JSI_EXPORT_FUNC(JsiSkPicture, dispose))
 
   size_t getMemoryPressure() const override {
-    auto picture = getObject();
+    if (isDisposed()) {
+      return 0;
+    }
+    auto picture = getObjectUnchecked();
     if (!picture) {
       return 0;
     }

package/cpp/api/JsiSkSurface.h

@@ -45,16 +45,27 @@ public:
     _dispatcher->processQueue();
   }
 
-  ~JsiSkSurface() override {
+protected:
+  void releaseResources() override {
     // Queue deletion on the creation thread if needed
-    auto surface = getObject();
+    auto surface = getObjectUnchecked();
     if (surface && _dispatcher) {
       _dispatcher->run([surface]() {
         // Surface will be deleted when this lambda is destroyed
       });
     }
-    // Clear the object to prevent base class destructor from deleting it
-    setObject(nullptr);
+    // Clear the object
+    JsiSkWrappingSkPtrHostObject<SkSurface>::releaseResources();
+  }
+
+public:
+  ~JsiSkSurface() override {
+    // If already disposed, resources were already cleaned up
+    if (isDisposed()) {
+      return;
+    }
+    // Use the same cleanup path as dispose()
+    releaseResources();
   }
 
   EXPORT_JSI_API_TYPENAME(JsiSkSurface, Surface)
@@ -117,7 +128,10 @@ public:
   }
 
   size_t getMemoryPressure() const override {
-    auto surface = getObject();
+    if (isDisposed()) {
+      return 0;
+    }
+    auto surface = getObjectUnchecked();
     if (!surface) {
       return 0;
     }

package/cpp/api/JsiVideo.h

@@ -49,6 +49,10 @@ public:
 
   JSI_HOST_FUNCTION(framerate) { return getObject()->framerate(); }
 
+  JSI_HOST_FUNCTION(currentTime) { return getObject()->currentTime(); }
+
+  JSI_HOST_FUNCTION(isPlaying) { return getObject()->isPlaying(); }
+
   JSI_HOST_FUNCTION(seek) {
     double timestamp = arguments[0].asNumber();
     getObject()->seek(timestamp);
@@ -86,12 +90,21 @@ public:
     return jsi::Value::undefined();
   }
 
+  JSI_HOST_FUNCTION(setLooping) {
+    auto looping = arguments[0].asBool();
+    getObject()->setLooping(looping);
+    return jsi::Value::undefined();
+  }
+
   JSI_EXPORT_FUNCTIONS(
       JSI_EXPORT_FUNC(JsiVideo, nextImage), JSI_EXPORT_FUNC(JsiVideo, duration),
-      JSI_EXPORT_FUNC(JsiVideo, framerate), JSI_EXPORT_FUNC(JsiVideo, seek),
+      JSI_EXPORT_FUNC(JsiVideo, framerate),
+      JSI_EXPORT_FUNC(JsiVideo, currentTime),
+      JSI_EXPORT_FUNC(JsiVideo, isPlaying), JSI_EXPORT_FUNC(JsiVideo, seek),
       JSI_EXPORT_FUNC(JsiVideo, rotation), JSI_EXPORT_FUNC(JsiVideo, size),
       JSI_EXPORT_FUNC(JsiVideo, play), JSI_EXPORT_FUNC(JsiVideo, pause),
-      JSI_EXPORT_FUNC(JsiVideo, setVolume), JSI_EXPORT_FUNC(JsiVideo, dispose))
+      JSI_EXPORT_FUNC(JsiVideo, setVolume),
+      JSI_EXPORT_FUNC(JsiVideo, setLooping), JSI_EXPORT_FUNC(JsiVideo, dispose))
 
   JsiVideo(std::shared_ptr<RNSkPlatformContext> context,
            std::shared_ptr<RNSkVideo> video)

package/cpp/api/recorder/Convertor.h

@@ -667,7 +667,8 @@ SkPath1DPathEffect::Style getPropertyValue(jsi::Runtime &runtime,
   throw std::runtime_error("Invalid prop value for Path1DEffectStyle received");
 }
 
-// Wrapper type for blend mode to avoid conflict with int template specialization
+// Wrapper type for blend mode to avoid conflict with int template
+// specialization
 struct BlendModeValue {
   int value;
   BlendModeValue(int v = 0) : value(v) {}
@@ -745,7 +746,8 @@ BlendModeValue getPropertyValue(jsi::Runtime &runtime, const jsi::Value &val) {
   throw std::runtime_error("Invalid prop value for BlendMode received");
 }
 
-// Keep SkBlendMode specialization for other usages (Shaders, ImageFilters, ColorFilters, Drawings)
+// Keep SkBlendMode specialization for other usages (Shaders, ImageFilters,
+// ColorFilters, Drawings)
 template <>
 SkBlendMode getPropertyValue(jsi::Runtime &runtime, const jsi::Value &val) {
   if (val.isString()) {

package/cpp/jsi2/EnumMapper.h

@@ -6,40 +6,55 @@
 namespace rnwgpu {
 
 namespace EnumMapper {
-  // Add these two methods in namespace "EnumMapper" to allow parsing a custom enum:
-  // 1. `static void convertJSUnionToEnum(const std::string& inUnion, Enum* outEnum)`
-  // 2. `static void convertEnumToJSUnion(Enum inEnum, std::string* outUnion)`
-
-  static std::runtime_error invalidUnion(const std::string& passedUnion) {
-    return std::runtime_error("Cannot convert JS Value to Enum: Invalid Union value passed! (\"" + std::string(passedUnion) + "\")");
-  }
-
-  template <typename T> static std::runtime_error invalidEnum(T passedEnum) {
-    return std::runtime_error("Cannot convert Enum to JS Value: Invalid Enum passed! (Value #" +
-                              std::to_string(static_cast<int>(passedEnum)) + ")");
-  }
-
-  // Trait to check if a convertJSUnionToEnum function for enum type T exists
-  template <typename T, typename = void> struct has_js_union_to_enum : std::false_type {};
-  template <typename T>
-  struct has_js_union_to_enum<T, std::void_t<decltype(convertJSUnionToEnum(std::declval<std::string>(), std::declval<T*>()))>>
-      : std::true_type {};
-
-  // Trait to check if a convertEnumToJSUnion function for enum type T exists
-  template <typename T, typename = void> struct has_enum_to_js_union : std::false_type {};
-  template <typename T>
-  struct has_enum_to_js_union<T, std::void_t<decltype(convertEnumToJSUnion(std::declval<T>(), std::declval<std::string*>()))>>
-      : std::true_type {};
-
-  template <typename TEnum> static void convertJSUnionToEnum(const std::string&, TEnum*) {
-    static_assert(has_js_union_to_enum<TEnum>::value,
-                  "Cannot convert a JS union to this enum type. Did you implement EnumMapper::convertJSUnionToEnum(...)?");
-  }
-
-  template <typename TEnum> static void convertEnumToJSUnion(TEnum, std::string*) {
-    static_assert(has_enum_to_js_union<TEnum>::value,
-                  "Cannot convert this enum type to a JS union. Did you implement EnumMapper::convertEnumToJSUnion(...)?");
-  }
+// Add these two methods in namespace "EnumMapper" to allow parsing a custom
+// enum:
+// 1. `static void convertJSUnionToEnum(const std::string& inUnion, Enum*
+// outEnum)`
+// 2. `static void convertEnumToJSUnion(Enum inEnum, std::string* outUnion)`
+
+static std::runtime_error invalidUnion(const std::string &passedUnion) {
+  return std::runtime_error(
+      "Cannot convert JS Value to Enum: Invalid Union value passed! (\"" +
+      std::string(passedUnion) + "\")");
+}
+
+template <typename T> static std::runtime_error invalidEnum(T passedEnum) {
+  return std::runtime_error(
+      "Cannot convert Enum to JS Value: Invalid Enum passed! (Value #" +
+      std::to_string(static_cast<int>(passedEnum)) + ")");
+}
+
+// Trait to check if a convertJSUnionToEnum function for enum type T exists
+template <typename T, typename = void>
+struct has_js_union_to_enum : std::false_type {};
+template <typename T>
+struct has_js_union_to_enum<
+    T, std::void_t<decltype(convertJSUnionToEnum(std::declval<std::string>(),
+                                                 std::declval<T *>()))>>
+    : std::true_type {};
+
+// Trait to check if a convertEnumToJSUnion function for enum type T exists
+template <typename T, typename = void>
+struct has_enum_to_js_union : std::false_type {};
+template <typename T>
+struct has_enum_to_js_union<
+    T, std::void_t<decltype(convertEnumToJSUnion(
+           std::declval<T>(), std::declval<std::string *>()))>>
+    : std::true_type {};
+
+template <typename TEnum>
+static void convertJSUnionToEnum(const std::string &, TEnum *) {
+  static_assert(has_js_union_to_enum<TEnum>::value,
+                "Cannot convert a JS union to this enum type. Did you "
+                "implement EnumMapper::convertJSUnionToEnum(...)?");
+}
+
+template <typename TEnum>
+static void convertEnumToJSUnion(TEnum, std::string *) {
+  static_assert(has_enum_to_js_union<TEnum>::value,
+                "Cannot convert this enum type to a JS union. Did you "
+                "implement EnumMapper::convertEnumToJSUnion(...)?");
+}
 } // namespace EnumMapper
 
 } // namespace rnwgpu