@shopify/react-native-skia 2.4.19 → 2.4.20

package/cpp/api/JsiSkImage.h

@@ -289,31 +289,26 @@ public:
                                               std::move(image)) {
     // Get the dispatcher for the current thread
     _dispatcher = Dispatcher::getDispatcher();
-    // Process any pending operations
+    // Process any pending operations (e.g. deletions of previous resources)
     _dispatcher->processQueue();
   }
 
-protected:
-  void releaseResources() override {
-    // Queue deletion on the creation thread if needed
-    auto image = getObjectUnchecked();
-    if (image && _dispatcher) {
-      _dispatcher->run([image]() {
-        // Image will be deleted when this lambda is destroyed
-      });
-    }
-    // Clear the object
-    JsiSkWrappingSkPtrHostObject<SkImage>::releaseResources();
-  }
-
 public:
   ~JsiSkImage() override {
-    // If already disposed, resources were already cleaned up
-    if (isDisposed()) {
-      return;
+    if (!isDisposed()) {
+      // This JSI Object is being deleted from a GC, which might happen
+      // on a separate Thread. GPU resources (like SkImage) must be deleted
+      // on the same Thread they were created on, so in this case we schedule
+      // deletion to run on the Thread this Object was created on.
+      auto image = getObjectUnchecked();
+      if (image && _dispatcher) {
+        _dispatcher->run([image]() {
+          // Image will be deleted when this lambda is destroyed, on the
+          // original Thread.
+        });
+      }
+      releaseResources();
     }
-    // Use the same cleanup path as dispose()
-    releaseResources();
   }
 
   size_t getMemoryPressure() const override {

package/cpp/api/JsiSkPicture.h

@@ -34,27 +34,22 @@ public:
     _dispatcher->processQueue();
   }
 
-protected:
-  void releaseResources() override {
-    // Queue deletion on the creation thread if needed
-    auto picture = getObjectUnchecked();
-    if (picture && _dispatcher) {
-      _dispatcher->run([picture]() {
-        // Picture will be deleted when this lambda is destroyed
-      });
-    }
-    // Clear the object
-    JsiSkWrappingSkPtrHostObject<SkPicture>::releaseResources();
-  }
-
 public:
   ~JsiSkPicture() override {
-    // If already disposed, resources were already cleaned up
-    if (isDisposed()) {
-      return;
+    if (!isDisposed()) {
+      // This JSI Object is being deleted from a GC, which might happen
+      // on a separate Thread. GPU resources (like SkPicture) must be deleted
+      // on the same Thread they were created on, so in this case we schedule
+      // deletion to run on the Thread this Object was created on.
+      auto picture = getObjectUnchecked();
+      if (picture && _dispatcher) {
+        _dispatcher->run([picture]() {
+          // Picture will be deleted when this lambda is destroyed, on the
+          // original Thread.
+        });
+      }
+      releaseResources();
     }
-    // Use the same cleanup path as dispose()
-    releaseResources();
   }
 
   JSI_HOST_FUNCTION(makeShader) {

package/cpp/api/JsiSkSurface.h

@@ -45,27 +45,22 @@ public:
     _dispatcher->processQueue();
   }
 
-protected:
-  void releaseResources() override {
-    // Queue deletion on the creation thread if needed
-    auto surface = getObjectUnchecked();
-    if (surface && _dispatcher) {
-      _dispatcher->run([surface]() {
-        // Surface will be deleted when this lambda is destroyed
-      });
-    }
-    // Clear the object
-    JsiSkWrappingSkPtrHostObject<SkSurface>::releaseResources();
-  }
-
 public:
   ~JsiSkSurface() override {
-    // If already disposed, resources were already cleaned up
-    if (isDisposed()) {
-      return;
+    if (!isDisposed()) {
+      // This JSI Object is being deleted from a GC, which might happen
+      // on a separate Thread. GPU resources (like SkSurface) must be deleted
+      // on the same Thread they were created on, so in this case we schedule
+      // deletion to run on the Thread this Object was created on.
+      auto surface = getObjectUnchecked();
+      if (surface && _dispatcher) {
+        _dispatcher->run([surface]() {
+          // Surface will be deleted when this lambda is destroyed, on the
+          // original Thread.
+        });
+      }
+      releaseResources();
     }
-    // Use the same cleanup path as dispose()
-    releaseResources();
   }
 
   EXPORT_JSI_API_TYPENAME(JsiSkSurface, Surface)

package/package.json

@@ -8,7 +8,7 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "2.4.19",
+  "version": "2.4.20",
   "skia": {
     "version": "m144c",
     "checksums": {