@shopify/react-native-skia 2.9.1 → 2.10.1

package/android/cpp/jni/JniWebGPUView.cpp

@@ -1,112 +0,0 @@
-#include <android/native_window_jni.h>
-#include <jni.h>
-
-#ifdef SK_GRAPHITE
-#include <memory>
-#include <utility>
-
-#include <ReactCommon/CallInvoker.h>
-
-#include "rnskia/RNDawnContext.h"
-#include "rnwgpu/SurfaceRegistry.h"
-#include "rnwgpu/async/RuntimeContext.h"
-#include "webgpu/webgpu_cpp.h"
-
-namespace {
-// Applies a surface attach latched by the platform UI thread (see
-// SurfaceInfo::applyPendingAttach) from the JS thread. Surface attaches are
-// normally adopted at the next frame boundary by whichever thread renders;
-// this flush covers contexts that are not actively rendering (static
-// content), so the last offscreen frame still makes it on screen. Mirrors
-// react-native-webgpu's RNWebGPUManager::flushPendingSurfaceTransition.
-void flushPendingSurfaceTransition(std::shared_ptr<rnwgpu::SurfaceInfo> info) {
-  if (info == nullptr) {
-    return;
-  }
-  auto invoker = rnwgpu::async::RuntimeContext::mainCallInvoker();
-  if (invoker == nullptr) {
-    return;
-  }
-  invoker->invokeAsync(
-      [info = std::move(info)] { info->applyPendingAttach(); });
-}
-} // namespace
-#endif
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_shopify_reactnative_skia_WebGPUView_onSurfaceCreate(
-    JNIEnv *env, jobject thiz, jobject jSurface, jint contextId, jfloat width,
-    jfloat height) {
-#ifdef SK_GRAPHITE
-  // ANativeWindow_fromSurface acquires a reference; SurfaceInfo releases it
-  // (via the releaser below) once it is done with the window.
-  auto window = ANativeWindow_fromSurface(env, jSurface);
-  if (window == nullptr) {
-    return;
-  }
-  auto &registry = rnwgpu::SurfaceRegistry::getInstance();
-  auto &dawnContext = RNSkia::DawnContext::getInstance();
-  auto gpu = dawnContext.getWGPUInstance();
-
-  // Create surface from ANativeWindow
-  wgpu::SurfaceSourceAndroidNativeWindow androidSurfaceDesc;
-  androidSurfaceDesc.window = window;
-  wgpu::SurfaceDescriptor surfaceDescriptor;
-  surfaceDescriptor.nextInChain = &androidSurfaceDesc;
-  auto surface = gpu.CreateSurface(&surfaceDescriptor);
-
-  // Find-or-create + attach runs atomically under the registry lock so a
-  // concurrent destroyContext cannot orphan this surface.
-  auto info = registry.attachSurface(
-      contextId, gpu, static_cast<int>(width), static_cast<int>(height), window,
-      surface, [](void *nativeSurface) {
-        ANativeWindow_release(static_cast<ANativeWindow *>(nativeSurface));
-      });
-  // The attach is adopted at the next frame boundary by the rendering thread;
-  // schedule a flush so contexts that are not currently rendering still pick
-  // it up (and present their last offscreen frame).
-  flushPendingSurfaceTransition(info);
-#endif
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_shopify_reactnative_skia_WebGPUView_onSurfaceChanged(
-    JNIEnv *env, jobject thiz, jobject surface, jint contextId, jfloat width,
-    jfloat height) {
-#ifdef SK_GRAPHITE
-  auto &registry = rnwgpu::SurfaceRegistry::getInstance();
-  auto surfaceInfo = registry.getSurfaceInfo(contextId);
-  if (surfaceInfo) {
-    surfaceInfo->resize(static_cast<int>(width), static_cast<int>(height));
-  }
-#endif
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_shopify_reactnative_skia_WebGPUView_switchToOffscreenSurface(
-    JNIEnv *env, jobject thiz, jint contextId) {
-#ifdef SK_GRAPHITE
-  auto &registry = rnwgpu::SurfaceRegistry::getInstance();
-  auto surfaceInfo = registry.getSurfaceInfo(contextId);
-  if (surfaceInfo) {
-    surfaceInfo->switchToOffscreen();
-  }
-#endif
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_shopify_reactnative_skia_WebGPUView_onViewDestroyed(JNIEnv *env,
-                                                             jobject thiz,
-                                                             jint contextId) {
-#ifdef SK_GRAPHITE
-  // The view dies with its Canvas (contextIds are never reused), so view
-  // teardown retires the registry entry. The JS-side cleanup
-  // (RNWebGPU.destroyContext) only handles entries that never had a native
-  // surface; see RNWebGPU::destroyContext for the ownership split.
-  auto &registry = rnwgpu::SurfaceRegistry::getInstance();
-  if (auto info = registry.getSurfaceInfo(contextId)) {
-    info->detachSurface();
-  }
-  registry.removeSurfaceInfo(contextId);
-#endif
-}

package/android/cpp/rnskia-android/SkiaPlatformContext.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#ifdef SK_GRAPHITE
-
-#include "rnwgpu/PlatformContext.h"
-
-namespace rnwgpu {
-
-class SkiaPlatformContext : public PlatformContext {
-public:
-  SkiaPlatformContext() = default;
-  ~SkiaPlatformContext() = default;
-
-  wgpu::Surface makeSurface(wgpu::Instance instance, void *surface, int width,
-                            int height) override {
-    wgpu::SurfaceDescriptorFromAndroidNativeWindow androidSurfaceDesc;
-    androidSurfaceDesc.window = surface;
-    wgpu::SurfaceDescriptor surfaceDescriptor;
-    surfaceDescriptor.nextInChain = &androidSurfaceDesc;
-    return instance.CreateSurface(&surfaceDescriptor);
-  }
-};
-
-} // namespace rnwgpu
-
-#endif // SK_GRAPHITE

package/android/src/main/java/com/shopify/reactnative/skia/WebGPUSurfaceView.java

@@ -1,43 +0,0 @@
-package com.shopify.reactnative.skia;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
-import androidx.annotation.NonNull;
-
-@SuppressLint("ViewConstructor")
-public class WebGPUSurfaceView extends SurfaceView implements SurfaceHolder.Callback {
-
-  WebGPUViewAPI mApi;
-
-  public WebGPUSurfaceView(Context context, WebGPUViewAPI api) {
-    super(context);
-    mApi = api;
-    getHolder().addCallback(this);
-  }
-
-  @Override
-  protected void onDetachedFromWindow() {
-    super.onDetachedFromWindow();
-    // surfaceDestroyed() normally fires during detach as well; going offscreen
-    // is idempotent, so this is just a safety net for paths where it does not.
-    mApi.surfaceOffscreen();
-  }
-
-  @Override
-  public void surfaceCreated(@NonNull SurfaceHolder holder) {
-    mApi.surfaceCreated(holder.getSurface());
-  }
-
-  @Override
-  public void surfaceChanged(@NonNull SurfaceHolder holder, int format, int width, int height) {
-    mApi.surfaceChanged(holder.getSurface());
-  }
-
-  @Override
-  public void surfaceDestroyed(@NonNull SurfaceHolder holder) {
-    mApi.surfaceOffscreen();
-  }
-}

package/android/src/main/java/com/shopify/reactnative/skia/WebGPUTextureView.java

@@ -1,50 +0,0 @@
-package com.shopify.reactnative.skia;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.SurfaceTexture;
-import android.view.Surface;
-import android.view.TextureView;
-import androidx.annotation.NonNull;
-
-@SuppressLint("ViewConstructor")
-public class WebGPUTextureView extends TextureView implements TextureView.SurfaceTextureListener {
-
-  WebGPUViewAPI mApi;
-  private Surface mSurface;
-
-  public WebGPUTextureView(Context context, WebGPUViewAPI api) {
-    super(context);
-    mApi = api;
-    setOpaque(false);
-    setSurfaceTextureListener(this);
-  }
-
-  @Override
-  public void onSurfaceTextureAvailable(@NonNull SurfaceTexture surfaceTexture, int width, int height) {
-    mSurface = new Surface(surfaceTexture);
-    mApi.surfaceCreated(mSurface);
-  }
-
-  @Override
-  public void onSurfaceTextureSizeChanged(@NonNull SurfaceTexture surfaceTexture, int width, int height) {
-    mApi.surfaceChanged(mSurface);
-  }
-
-  @Override
-  public boolean onSurfaceTextureDestroyed(@NonNull SurfaceTexture surfaceTexture) {
-    // Detach first (synchronous through JNI) so the native side has dropped
-    // its window reference before we release ours.
-    mApi.surfaceOffscreen();
-    if (mSurface != null) {
-      mSurface.release();
-      mSurface = null;
-    }
-    return true;
-  }
-
-  @Override
-  public void onSurfaceTextureUpdated(@NonNull SurfaceTexture surfaceTexture) {
-    // No implementation needed
-  }
-}

package/android/src/main/java/com/shopify/reactnative/skia/WebGPUView.java

@@ -1,98 +0,0 @@
-package com.shopify.reactnative.skia;
-
-import android.content.Context;
-import android.view.Surface;
-import android.view.View;
-
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.views.view.ReactViewGroup;
-
-public class WebGPUView extends ReactViewGroup implements WebGPUViewAPI {
-
-  private int mContextId;
-  private boolean mTransparent = false;
-  private View mView = null;
-
-  WebGPUView(Context context) {
-    super(context);
-  }
-
-  public void setContextId(int contextId) {
-    mContextId = contextId;
-  }
-
-  public void setTransparent(boolean value) {
-    Context ctx = getContext();
-    if (value != mTransparent || mView == null) {
-      if (mView != null) {
-        removeView(mView);
-      }
-      mTransparent = value;
-      if (mTransparent) {
-        mView = new WebGPUTextureView(ctx, this);
-      } else {
-        mView = new WebGPUSurfaceView(ctx, this);
-      }
-      addView(mView);
-    }
-  }
-
-  @Override
-  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-    super.onLayout(changed, left, top, right, bottom);
-    if (mView != null) {
-      mView.layout(0, 0, this.getMeasuredWidth(), this.getMeasuredHeight());
-    }
-  }
-
-  @Override
-  public void surfaceCreated(Surface surface) {
-    float density = getResources().getDisplayMetrics().density;
-    float width = getWidth() / density;
-    float height = getHeight() / density;
-    onSurfaceCreate(surface, mContextId, width, height);
-  }
-
-  @Override
-  public void surfaceChanged(Surface surface) {
-    float density = getResources().getDisplayMetrics().density;
-    float width = getWidth() / density;
-    float height = getHeight() / density;
-    onSurfaceChanged(surface, mContextId, width, height);
-  }
-
-  @Override
-  public void surfaceOffscreen() {
-    switchToOffscreenSurface(mContextId);
-  }
-
-  /**
-   * Called from WebGPUViewManager.onDropViewInstance when React removes this
-   * view: the view dies with its Canvas, so it retires the registry entry.
-   */
-  public void destroy() {
-    onViewDestroyed(mContextId);
-  }
-
-  @DoNotStrip
-  private native void onSurfaceCreate(
-    Surface surface,
-    int contextId,
-    float width,
-    float height
-  );
-
-  @DoNotStrip
-  private native void onSurfaceChanged(
-    Surface surface,
-    int contextId,
-    float width,
-    float height
-  );
-
-  @DoNotStrip
-  private native void switchToOffscreenSurface(int contextId);
-
-  @DoNotStrip
-  private native void onViewDestroyed(int contextId);
-}

package/android/src/main/java/com/shopify/reactnative/skia/WebGPUViewAPI.java

@@ -1,19 +0,0 @@
-package com.shopify.reactnative.skia;
-
-import android.view.Surface;
-
-/**
- * Surface lifecycle events a WebGPU child view reports. The registry entry
- * itself is owned by the JS Canvas component (created lazily, removed via
- * RNWebGPU.destroyContext on unmount); views only attach and detach surfaces.
- * A detached context keeps rendering into an offscreen texture whose content
- * is blitted onto the next attached surface.
- */
-public interface WebGPUViewAPI {
-
-  void surfaceCreated(Surface surface);
-
-  void surfaceChanged(Surface surface);
-
-  void surfaceOffscreen();
-}

package/android/src/main/java/com/shopify/reactnative/skia/WebGPUViewManager.java

@@ -1,58 +0,0 @@
-package com.shopify.reactnative.skia;
-
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.views.view.ReactViewGroup;
-import com.facebook.react.views.view.ReactViewManager;
-import com.facebook.react.viewmanagers.SkiaWebGPUViewManagerDelegate;
-import com.facebook.react.viewmanagers.SkiaWebGPUViewManagerInterface;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-@ReactModule(name = WebGPUViewManager.NAME)
-public class WebGPUViewManager extends ReactViewManager implements SkiaWebGPUViewManagerInterface<WebGPUView> {
-
-  public static final String NAME = "SkiaWebGPUView";
-
-  protected SkiaWebGPUViewManagerDelegate mDelegate;
-
-  public WebGPUViewManager() {
-    mDelegate = new SkiaWebGPUViewManagerDelegate(this);
-  }
-
-  protected SkiaWebGPUViewManagerDelegate getDelegate() {
-    return mDelegate;
-  }
-
-  @NonNull
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
-  @NonNull
-  @Override
-  public WebGPUView createViewInstance(@NonNull ThemedReactContext context) {
-    return new WebGPUView(context);
-  }
-
-  @Override
-  @ReactProp(name = "transparent")
-  public void setTransparent(WebGPUView view, boolean value) {
-    view.setTransparent(value);
-  }
-
-  @Override
-  @ReactProp(name = "contextId")
-  public void setContextId(WebGPUView view, int value) {
-    view.setContextId(value);
-  }
-
-  @Override
-  public void onDropViewInstance(@NonNull ReactViewGroup view) {
-    super.onDropViewInstance(view);
-    ((WebGPUView) view).destroy();
-  }
-}

package/apple/RNWebGPUAppleNativeBuffer.mm

@@ -1,33 +0,0 @@
-#ifdef SK_GRAPHITE
-
-#import <CoreVideo/CoreVideo.h>
-
-#include "rnwgpu/api/AppleNativeBuffer.h"
-
-namespace rnwgpu {
-
-void *GetIOSurfaceFromNativeBuffer(void *cvPixelBuffer, uint32_t *outWidth,
-                                   uint32_t *outHeight) {
-  auto pixelBuffer = reinterpret_cast<CVPixelBufferRef>(cvPixelBuffer);
-  if (pixelBuffer == nullptr) {
-    if (outWidth != nullptr) {
-      *outWidth = 0;
-    }
-    if (outHeight != nullptr) {
-      *outHeight = 0;
-    }
-    return nullptr;
-  }
-  if (outWidth != nullptr) {
-    *outWidth = static_cast<uint32_t>(CVPixelBufferGetWidth(pixelBuffer));
-  }
-  if (outHeight != nullptr) {
-    *outHeight = static_cast<uint32_t>(CVPixelBufferGetHeight(pixelBuffer));
-  }
-  // The IOSurface is owned by the CVPixelBuffer; we don't retain it here.
-  return CVPixelBufferGetIOSurface(pixelBuffer);
-}
-
-} // namespace rnwgpu
-
-#endif // SK_GRAPHITE

package/apple/SkiaPlatformContext.h

@@ -1,20 +0,0 @@
-#pragma once
-
-#ifdef SK_GRAPHITE
-
-#include "rnwgpu/PlatformContext.h"
-
-namespace rnwgpu {
-
-class SkiaPlatformContext : public PlatformContext {
-public:
-  SkiaPlatformContext() = default;
-  ~SkiaPlatformContext() = default;
-
-  wgpu::Surface makeSurface(wgpu::Instance instance, void *surface, int width,
-                            int height) override;
-};
-
-} // namespace rnwgpu
-
-#endif // SK_GRAPHITE

package/apple/SkiaPlatformContext.mm

@@ -1,21 +0,0 @@
-#ifdef SK_GRAPHITE
-
-#include "SkiaPlatformContext.h"
-
-#include <TargetConditionals.h>
-
-namespace rnwgpu {
-
-wgpu::Surface SkiaPlatformContext::makeSurface(wgpu::Instance instance,
-                                               void *surface, int width,
-                                               int height) {
-  wgpu::SurfaceSourceMetalLayer metalSurfaceDesc;
-  metalSurfaceDesc.layer = surface;
-  wgpu::SurfaceDescriptor surfaceDescriptor;
-  surfaceDescriptor.nextInChain = &metalSurfaceDesc;
-  return instance.CreateSurface(&surfaceDescriptor);
-}
-
-} // namespace rnwgpu
-
-#endif // SK_GRAPHITE

package/apple/SkiaWebGPUView.mm

@@ -1,81 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#import "SkiaWebGPUView.h"
-
-#import <react/renderer/components/rnskia/ComponentDescriptors.h>
-#import <react/renderer/components/rnskia/EventEmitters.h>
-#import <react/renderer/components/rnskia/Props.h>
-#import <react/renderer/components/rnskia/RCTComponentViewHelpers.h>
-
-#import "RCTFabricComponentsPlugins.h"
-#import "WebGPUMetalView.h"
-
-using namespace facebook::react;
-
-@implementation SkiaWebGPUView
-
-- (instancetype)initWithFrame:(CGRect)frame {
-  if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps =
-        std::make_shared<const SkiaWebGPUViewProps>();
-    _props = defaultProps;
-  }
-  return self;
-}
-
-+ (ComponentDescriptorProvider)componentDescriptorProvider {
-  return concreteComponentDescriptorProvider<
-      SkiaWebGPUViewComponentDescriptor>();
-}
-
-- (void)prepareForRecycle {
-  [super prepareForRecycle];
-  /*
-    It's important to destroy the Metal Layer before releasing a view
-    to the recycled pool to prevent displaying outdated content from
-    the last usage in the new context.
-  */
-  self.contentView = nil;
-}
-
-- (WebGPUMetalView *)getContentView {
-  if (!self.contentView) {
-    self.contentView = [WebGPUMetalView new];
-  }
-  return (WebGPUMetalView *)self.contentView;
-}
-
-- (void)updateProps:(const Props::Shared &)props
-           oldProps:(const Props::Shared &)oldProps {
-  const auto &oldViewProps =
-      *std::static_pointer_cast<const SkiaWebGPUViewProps>(_props);
-  const auto &newViewProps =
-      *std::static_pointer_cast<const SkiaWebGPUViewProps>(props);
-
-  if (newViewProps.contextId != oldViewProps.contextId) {
-    /*
-      The context is set only once during mounting the component
-      and never changes because it isn't available for users to modify.
-    */
-    WebGPUMetalView *metalView = [WebGPUMetalView new];
-    self.contentView = metalView;
-    [metalView setContextId:@(newViewProps.contextId)];
-    [metalView configure];
-  }
-
-  [super updateProps:props oldProps:oldProps];
-}
-
-- (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
-           oldLayoutMetrics:(const LayoutMetrics &)oldLayoutMetrics {
-  [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
-  [(WebGPUMetalView *)self.contentView update];
-}
-
-@end
-
-Class<RCTComponentViewProtocol> SkiaWebGPUViewCls(void) {
-  return SkiaWebGPUView.class;
-}
-
-#endif // RCT_NEW_ARCH_ENABLED