@shopify/react-native-skia 2.9.1 → 2.10.0

package/cpp/rnskia/RNSkManager.cpp

@@ -5,27 +5,27 @@
 
 #include <jsi/jsi.h>
 
-#include "api/JsiSkApi.h"
 #include "RNSkJsiViewApi.h"
 #include "RNSkView.h"
+#include "api/JsiSkApi.h"
 
 #include "jsi/RuntimeAwareCache.h"
 
 #ifdef SK_GRAPHITE
 #include "RNDawnContext.h"
+#include "jsi/Promise.h"
 #include "rnwgpu/ArrayBuffer.h"
 #include "rnwgpu/api/GPU.h"
 #include "rnwgpu/api/GPUUncapturedErrorEvent.h"
 #include "rnwgpu/api/ImageBitmap.h"
 #include "rnwgpu/api/RNWebGPU.h"
+#include "rnwgpu/api/WebGPUConstants.h"
 #include "rnwgpu/api/descriptors/GPUBufferUsage.h"
 #include "rnwgpu/api/descriptors/GPUColorWrite.h"
 #include "rnwgpu/api/descriptors/GPUMapMode.h"
 #include "rnwgpu/api/descriptors/GPUShaderStage.h"
 #include "rnwgpu/api/descriptors/GPUTextureUsage.h"
-#include "rnwgpu/api/WebGPUConstants.h"
 #include "rnwgpu/async/RuntimeContext.h"
-#include "jsi2/Promise.h"
 
 #include "include/core/SkData.h"
 #include "include/core/SkImage.h"
@@ -82,19 +82,18 @@ void RNSkManager::installBindings() {
   // provided runtime.
   auto skiaApi = std::make_shared<JsiSkApi>(_platformContext);
   _jsRuntime->global().setProperty(
-      *_jsRuntime, "SkiaApi",
-      jsi::Object::createFromHostObject(*_jsRuntime, std::move(skiaApi)));
+      *_jsRuntime, "SkiaApi", makeJsiObject(*_jsRuntime, std::move(skiaApi)));
 
-  _jsRuntime->global().setProperty(
-      *_jsRuntime, "SkiaViewApi",
-      jsi::Object::createFromHostObject(*_jsRuntime, _viewApi));
+  _jsRuntime->global().setProperty(*_jsRuntime, "SkiaViewApi",
+                                   makeJsiObject(*_jsRuntime, _viewApi));
 
 #ifdef SK_GRAPHITE
   // Register the main runtime + its CallInvoker so spontaneous events
   // (device.lost / uncapturederror) on main-runtime devices can be delivered to
   // the JS thread without the ProcessEvents pump. Worklet-runtime devices have
   // no invoker (best-effort; see the RuntimeContext "Threading model" doc).
-  rnwgpu::async::RuntimeContext::registerMainRuntime(_jsRuntime, _jsCallInvoker);
+  rnwgpu::async::RuntimeContext::registerMainRuntime(_jsRuntime,
+                                                     _jsCallInvoker);
 
   // Install WebGPU constructors
   rnwgpu::GPU::installConstructor(*_jsRuntime);
@@ -121,13 +120,14 @@ void RNSkManager::installBindings() {
   // Install WebGPU constant objects as plain JS objects on the main runtime.
   rnwgpu::installWebGPUConstants(*_jsRuntime);
 
-  // Install a global `installWebGPU()` host function so worklet runtimes can get
-  // the same constants. A host function captured into a worklet is serialized as
-  // a SerializableHostFunction and re-created on the worklet runtime, so the body
-  // runs there (its `rt` is the worklet runtime) and installs the constants on
-  // that runtime. The constants come from the native wgpu::*Usage enums, so the
-  // values stay a single source of truth across every runtime. Calling it on a
-  // runtime that already has the globals is a safe, idempotent no-op.
+  // Install a global `installWebGPU()` host function so worklet runtimes can
+  // get the same constants. A host function captured into a worklet is
+  // serialized as a SerializableHostFunction and re-created on the worklet
+  // runtime, so the body runs there (its `rt` is the worklet runtime) and
+  // installs the constants on that runtime. The constants come from the native
+  // wgpu::*Usage enums, so the values stay a single source of truth across
+  // every runtime. Calling it on a runtime that already has the globals is a
+  // safe, idempotent no-op.
   _jsRuntime->global().setProperty(
       *_jsRuntime, "installWebGPU",
       jsi::Function::createFromHostFunction(
@@ -172,9 +172,8 @@ void RNSkManager::installBindings() {
             bool isBufferSource = obj.isArrayBuffer(rt);
             if (!isBufferSource && obj.hasProperty(rt, "buffer")) {
               auto bufferProp = obj.getProperty(rt, "buffer");
-              isBufferSource =
-                  bufferProp.isObject() &&
-                  bufferProp.getObject(rt).isArrayBuffer(rt);
+              isBufferSource = bufferProp.isObject() &&
+                               bufferProp.getObject(rt).isArrayBuffer(rt);
             }
             if (!isBufferSource) {
               throw jsi::JSError(rt, "createImageBitmap: unsupported source "
@@ -183,9 +182,9 @@ void RNSkManager::installBindings() {
             }
             // Validates bounds and THROWS synchronously on a spoofed view, so
             // the bad pointer never reaches the copy below.
-            auto buffer =
-                rnwgpu::JSIConverter<std::shared_ptr<rnwgpu::ArrayBuffer>>::
-                    fromJSI(rt, args[0], false);
+            auto buffer = rnwgpu::JSIConverter<
+                std::shared_ptr<rnwgpu::ArrayBuffer>>::fromJSI(rt, args[0],
+                                                               false);
             // Copy the encoded bytes off the JS-owned ArrayBuffer.
             const uint8_t *bytes = buffer->data();
             std::vector<uint8_t> encoded(bytes, bytes + buffer->size());
@@ -204,9 +203,8 @@ void RNSkManager::installBindings() {
                   }
                   const int w = image->width();
                   const int h = image->height();
-                  auto info =
-                      SkImageInfo::Make(w, h, kRGBA_8888_SkColorType,
-                                        kUnpremul_SkAlphaType);
+                  auto info = SkImageInfo::Make(w, h, kRGBA_8888_SkColorType,
+                                                kUnpremul_SkAlphaType);
                   std::vector<uint8_t> pixels(info.computeMinByteSize());
                   // nullptr context: decode/read on the CPU (raster).
                   if (!image->readPixels(nullptr, info, pixels.data(),

package/cpp/rnskia/RNSkPictureView.h

@@ -13,9 +13,9 @@
 #include "RNSkView.h"
 #include "jsi/ViewProperty.h"
 
+#include "RNSkPlatformContext.h"
 #include "api/JsiSkPicture.h"
 #include "utils/RNSkLog.h"
-#include "RNSkPlatformContext.h"
 #include "utils/RNSkTimingInfo.h"
 
 #pragma clang diagnostic push

package/cpp/rnwgpu/ArrayBuffer.h

@@ -5,7 +5,7 @@
 #include <cstdint>
 #include <memory>
 
-#include "jsi2/JSIConverter.h"
+#include "jsi/JSIConverter.h"
 
 namespace rnwgpu {
 
@@ -77,8 +77,7 @@ template <> struct JSIConverter<std::shared_ptr<ArrayBuffer>> {
           const size_t byteLength = static_cast<size_t>(byteLengthValue);
 
           // Overflow-safe bounds check: byteOffset + byteLength <= bufferSize.
-          if (byteOffset > bufferSize ||
-              byteLength > bufferSize - byteOffset) {
+          if (byteOffset > bufferSize || byteLength > bufferSize - byteOffset) {
             throw std::runtime_error(
                 "ArrayBuffer::fromJSI: view bounds [byteOffset, byteOffset + "
                 "byteLength) exceed the backing ArrayBuffer size");
@@ -98,9 +97,9 @@ template <> struct JSIConverter<std::shared_ptr<ArrayBuffer>> {
             }
           }
 
-          return std::make_shared<ArrayBuffer>(
-              arrayBuffer.data(runtime) + byteOffset, byteLength,
-              bytesPerElements);
+          return std::make_shared<ArrayBuffer>(arrayBuffer.data(runtime) +
+                                                   byteOffset,
+                                               byteLength, bytesPerElements);
         }
       }
     }

package/cpp/rnwgpu/Canvas.h

@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 namespace rnwgpu {
 
@@ -10,7 +10,9 @@ namespace jsi = facebook::jsi;
 
 class Canvas : public NativeObject<Canvas> {
 public:
-  static constexpr const char *CLASS_NAME = "Canvas";
+  // Note: not "Canvas" — that brand belongs to RNSkia::JsiSkCanvas, and
+  // boxing brands must be unique process-wide (see BoxedNativeObjectRegistry).
+  static constexpr const char *CLASS_NAME = "WebGPUCanvas";
 
   Canvas(void *nativeSurface, int width, int height)
       : NativeObject(CLASS_NAME), _nativeSurface(nativeSurface), _width(width),

package/cpp/rnwgpu/api/GPU.cpp

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "Convertors.h"
-#include "jsi2/JSIConverter.h"
+#include "jsi/JSIConverter.h"
 #include "rnwgpu/async/RuntimeContext.h"
 
 namespace rnwgpu {
@@ -40,9 +40,9 @@ async::AsyncTaskHandle GPU::requestAdapter(
                 const async::AsyncTaskHandle::RejectFunction &reject) {
         _instance.RequestAdapter(
             &aOptions, wgpu::CallbackMode::AllowProcessEvents,
-            [context, resolve,
-             reject](wgpu::RequestAdapterStatus status, wgpu::Adapter adapter,
-                     wgpu::StringView message) {
+            [context, resolve, reject](wgpu::RequestAdapterStatus status,
+                                       wgpu::Adapter adapter,
+                                       wgpu::StringView message) {
               if (message.length) {
                 fprintf(stderr, "%s", message.data);
               }

package/cpp/rnwgpu/api/GPU.h

@@ -7,7 +7,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "rnwgpu/async/AsyncTaskHandle.h"
 #include "rnwgpu/async/RuntimeContext.h"

package/cpp/rnwgpu/api/GPUAdapter.cpp

@@ -13,7 +13,7 @@
 #include "GPUInternalError.h"
 #include "GPUOutOfMemoryError.h"
 #include "GPUValidationError.h"
-#include "jsi2/JSIConverter.h"
+#include "jsi/JSIConverter.h"
 
 namespace rnwgpu {
 
@@ -147,8 +147,7 @@ async::AsyncTaskHandle GPUAdapter::requestDevice(
             &deviceDesc, wgpu::CallbackMode::AllowProcessEvents,
             [context, resolve, reject, label, creationRuntime,
              deviceLostBinding](wgpu::RequestDeviceStatus status,
-                                wgpu::Device device,
-                                wgpu::StringView message) {
+                                wgpu::Device device, wgpu::StringView message) {
               if (message.length) {
                 fprintf(stderr, "%s", message.data);
               }

package/cpp/rnwgpu/api/GPUAdapter.h

@@ -6,7 +6,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "rnwgpu/async/AsyncTaskHandle.h"
 #include "rnwgpu/async/RuntimeContext.h"
@@ -33,9 +33,9 @@ public:
 public:
   std::string getBrand() { return CLASS_NAME; }
 
-  async::AsyncTaskHandle requestDevice(
-      jsi::Runtime &runtime,
-      std::optional<std::shared_ptr<GPUDeviceDescriptor>> descriptor);
+  async::AsyncTaskHandle
+  requestDevice(jsi::Runtime &runtime,
+                std::optional<std::shared_ptr<GPUDeviceDescriptor>> descriptor);
 
   std::unordered_set<std::string> getFeatures();
   std::shared_ptr<GPUSupportedLimits> getLimits();

package/cpp/rnwgpu/api/GPUAdapterInfo.h

@@ -5,7 +5,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "Convertors.h"
 

package/cpp/rnwgpu/api/GPUBindGroup.h

@@ -4,7 +4,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUBindGroupLayout.h

@@ -4,7 +4,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUBuffer.h

@@ -7,7 +7,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "rnwgpu/async/AsyncTaskHandle.h"
 #include "rnwgpu/async/RuntimeContext.h"

package/cpp/rnwgpu/api/GPUCanvasContext.h

@@ -8,7 +8,7 @@
 
 #include "webgpu/webgpu_cpp.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "GPU.h"
 #include "GPUTexture.h"

package/cpp/rnwgpu/api/GPUCommandBuffer.h

@@ -4,7 +4,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUCommandEncoder.h

@@ -5,7 +5,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUCompilationInfo.h

@@ -5,7 +5,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUCompilationMessage.h

@@ -4,7 +4,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUComputePassEncoder.h

@@ -8,7 +8,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUComputePipeline.h

@@ -5,7 +5,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUDevice.cpp

@@ -10,7 +10,7 @@
 
 #include "Convertors.h"
 #include "NativeBufferUtils.h"
-#include "jsi2/JSIConverter.h"
+#include "jsi/JSIConverter.h"
 
 #include "GPUFeatures.h"
 #include "GPUInternalError.h"
@@ -363,9 +363,9 @@ async::AsyncTaskHandle GPUDevice::createComputePipelineAsync(
                   runtime, pipelineHolder);
             });
           } else {
-            std::string error =
-                msg.length ? std::string(msg.data, msg.length)
-                           : "Failed to create compute pipeline";
+            std::string error = msg.length
+                                    ? std::string(msg.data, msg.length)
+                                    : "Failed to create compute pipeline";
             reject(std::move(error));
           }
         });
@@ -410,9 +410,8 @@ async::AsyncTaskHandle GPUDevice::createRenderPipelineAsync(
                   runtime, pipelineHolder);
             });
           } else {
-            std::string error =
-                msg.length ? std::string(msg.data, msg.length)
-                           : "Failed to create render pipeline";
+            std::string error = msg.length ? std::string(msg.data, msg.length)
+                                           : "Failed to create render pipeline";
             reject(std::move(error));
           }
         });

package/cpp/rnwgpu/api/GPUDevice.h

@@ -13,7 +13,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "rnwgpu/async/AsyncTaskHandle.h"
 #include "rnwgpu/async/RuntimeContext.h"
@@ -240,8 +240,8 @@ private:
   std::shared_ptr<async::RuntimeContext> _async;
   std::string _label;
   // Guards the device-lost state below. In the ProcessEvents model both
-  // notifyDeviceLost() (fired by Dawn during ProcessEvents) and getLost() run on
-  // the owning runtime's own thread, but device destruction can also trigger
+  // notifyDeviceLost() (fired by Dawn during ProcessEvents) and getLost() run
+  // on the owning runtime's own thread, but device destruction can also trigger
   // notifyDeviceLost() synchronously, so the mutex keeps these fields safe.
   std::mutex _lostMutex;
   std::optional<async::AsyncTaskHandle> _lostHandle;

package/cpp/rnwgpu/api/GPUDeviceLostInfo.h

@@ -4,7 +4,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUError.h

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 namespace rnwgpu {
 

package/cpp/rnwgpu/api/GPUExtent3D.h

@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "jsi2/JSIConverter.h"
+#include "jsi/JSIConverter.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUExternalTexture.h

@@ -6,7 +6,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUInternalError.h

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 namespace rnwgpu {
 

package/cpp/rnwgpu/api/GPUOrigin2D.h

@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "jsi2/JSIConverter.h"
+#include "jsi/JSIConverter.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUOrigin3D.h

@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "jsi2/JSIConverter.h"
+#include "jsi/JSIConverter.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUOutOfMemoryError.h

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 namespace rnwgpu {
 

package/cpp/rnwgpu/api/GPUPipelineLayout.h

@@ -4,7 +4,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUQuerySet.h

@@ -4,7 +4,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUQueue.h

@@ -6,7 +6,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "rnwgpu/async/AsyncTaskHandle.h"
 #include "rnwgpu/async/RuntimeContext.h"

package/cpp/rnwgpu/api/GPURenderBundle.h

@@ -4,7 +4,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPURenderBundleEncoder.h

@@ -8,7 +8,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPURenderPassEncoder.h

@@ -8,7 +8,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPURenderPipeline.h

@@ -5,7 +5,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUSampler.h

@@ -4,7 +4,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUShaderModule.cpp

@@ -3,7 +3,7 @@
 #include <memory>
 #include <utility>
 
-#include "jsi2/JSIConverter.h"
+#include "jsi/JSIConverter.h"
 
 namespace rnwgpu {
 

package/cpp/rnwgpu/api/GPUShaderModule.h

@@ -5,7 +5,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "rnwgpu/async/AsyncTaskHandle.h"
 #include "rnwgpu/async/RuntimeContext.h"

package/cpp/rnwgpu/api/GPUSharedFence.h

@@ -3,7 +3,7 @@
 #include <memory>
 #include <string>
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUSharedTextureMemory.h

@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUSupportedLimits.h

@@ -4,7 +4,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"
 

package/cpp/rnwgpu/api/GPUTexture.h

@@ -6,7 +6,7 @@
 
 #include "descriptors/Unions.h"
 
-#include "jsi2/NativeObject.h"
+#include "jsi/NativeObject.h"
 
 #include "webgpu/webgpu_cpp.h"