@shopify/react-native-skia 1.5.5 → 1.5.7

package/android/CMakeLists.txt

@@ -74,7 +74,7 @@ add_library(
         "${PROJECT_SOURCE_DIR}/cpp/jni/JniSkiaManager.cpp"
 
         "${PROJECT_SOURCE_DIR}/cpp/jni/JniPlatformContext.cpp"
-        "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/opengl/Error.cpp"
+        "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/gl/Error.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/RNSkOpenGLCanvasProvider.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/AHardwareBufferUtils.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/RNSkAndroidVideo.cpp"

package/android/cpp/jni/include/JniSkiaBaseView.h

@@ -33,8 +33,8 @@ protected:
     _skiaAndroidView->surfaceAvailable(surface, width, height);
   }
 
-  virtual void surfaceSizeChanged(int width, int height) {
-    _skiaAndroidView->surfaceSizeChanged(width, height);
+  virtual void surfaceSizeChanged(jobject surface, int width, int height) {
+    _skiaAndroidView->surfaceSizeChanged(surface, width, height);
   }
 
   virtual void surfaceDestroyed() { _skiaAndroidView->surfaceDestroyed(); }

package/android/cpp/jni/include/JniSkiaDomView.h

@@ -51,8 +51,8 @@ protected:
     JniSkiaBaseView::surfaceAvailable(surface, width, height);
   }
 
-  void surfaceSizeChanged(int width, int height) override {
-    JniSkiaBaseView::surfaceSizeChanged(width, height);
+  void surfaceSizeChanged(jobject surface, int width, int height) override {
+    JniSkiaBaseView::surfaceSizeChanged(surface, width, height);
   }
 
   void surfaceDestroyed() override { JniSkiaBaseView::surfaceDestroyed(); }

package/android/cpp/jni/include/JniSkiaPictureView.h

@@ -53,8 +53,8 @@ protected:
     JniSkiaBaseView::surfaceAvailable(surface, width, height);
   }
 
-  void surfaceSizeChanged(int width, int height) override {
-    JniSkiaBaseView::surfaceSizeChanged(width, height);
+  void surfaceSizeChanged(jobject surface, int width, int height) override {
+    JniSkiaBaseView::surfaceSizeChanged(surface, width, height);
   }
 
   void surfaceDestroyed() override { JniSkiaBaseView::surfaceDestroyed(); }

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

@@ -2,7 +2,7 @@
 
 #include "GrAHardwareBufferUtils.h"
 #include "OpenGLWindowContext.h"
-#include "opengl/Display.h"
+#include "gl/Display.h"
 
 #include "include/core/SkCanvas.h"
 #include "include/core/SkColorSpace.h"
@@ -14,8 +14,12 @@
 #include "include/gpu/ganesh/gl/GrGLInterface.h"
 #include "src/gpu/ganesh/gl/GrGLDefines.h"
 
+namespace RNSkia {
+
 class OpenGLContext {
 public:
+  friend class OpenGLWindowContext;
+
   OpenGLContext(const OpenGLContext &) = delete;
   OpenGLContext &operator=(const OpenGLContext &) = delete;
 
@@ -29,7 +33,7 @@ public:
 
     SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
 
-    auto result = _ctx->makeCurrent(*_surface);
+    auto result = _glContext->makeCurrent(_glSurface.get());
     if (!result) {
       return nullptr;
     }
@@ -39,8 +43,8 @@ public:
         width, height, colorType, skgpu::Mipmapped::kNo, GrRenderable::kYes);
 
     if (!texture.isValid()) {
-      RNSkia::RNSkLogger::logToConsole(
-          "couldn't create offscreen texture %dx%d", width, height);
+      RNSkLogger::logToConsole("couldn't create offscreen texture %dx%d", width,
+                               height);
     }
 
     struct ReleaseContext {
@@ -68,9 +72,9 @@ public:
 #if __ANDROID_API__ >= 26
     const AHardwareBuffer *hardwareBuffer =
         static_cast<AHardwareBuffer *>(buffer);
-    RNSkia::DeleteImageProc deleteImageProc = nullptr;
-    RNSkia::UpdateImageProc updateImageProc = nullptr;
-    RNSkia::TexImageCtx deleteImageCtx = nullptr;
+    DeleteImageProc deleteImageProc = nullptr;
+    UpdateImageProc updateImageProc = nullptr;
+    TexImageCtx deleteImageCtx = nullptr;
 
     AHardwareBuffer_Desc description;
     AHardwareBuffer_describe(hardwareBuffer, &description);
@@ -100,12 +104,12 @@ public:
       }
     }
 
-    auto backendTex = RNSkia::MakeGLBackendTexture(
+    auto backendTex = MakeGLBackendTexture(
         _directContext.get(), const_cast<AHardwareBuffer *>(hardwareBuffer),
         description.width, description.height, &deleteImageProc,
         &updateImageProc, &deleteImageCtx, false, format, false);
     if (!backendTex.isValid()) {
-      RNSkia::RNSkLogger::logToConsole(
+      RNSkLogger::logToConsole(
           "Failed to convert HardwareBuffer to OpenGL Texture!");
       return nullptr;
     }
@@ -121,26 +125,26 @@ public:
 #endif
   }
 
-  std::unique_ptr<RNSkia::WindowContext> MakeWindow(ANativeWindow *window,
-                                                    int width, int height) {
-    return std::make_unique<RNSkia::OpenGLWindowContext>(
-        _config, _display.get(), _ctx.get(), _directContext.get(), window,
-        width, height);
+  // TODO: remove width, height
+  std::unique_ptr<WindowContext> MakeWindow(ANativeWindow *window, int width,
+                                            int height) {
+    return std::make_unique<OpenGLWindowContext>(
+        _directContext, _glDisplay.get(), _glContext.get(), window);
   }
 
 private:
-  EGLConfig _config;
-  std::unique_ptr<RNSkia::Display> _display;
-  std::unique_ptr<RNSkia::Context> _ctx;
-  std::unique_ptr<RNSkia::Surface> _surface;
+  EGLConfig _glConfig;
+  std::unique_ptr<gl::Display> _glDisplay;
+  std::unique_ptr<gl::Context> _glContext;
+  std::unique_ptr<gl::Surface> _glSurface;
   sk_sp<GrDirectContext> _directContext;
 
   OpenGLContext() {
-    _display = std::make_unique<RNSkia::Display>();
-    _config = _display->chooseConfig();
-    _ctx = _display->makeContext(_config, nullptr);
-    _surface = _display->makePixelBufferSurface(_config, 1, 1);
-    _ctx->makeCurrent(*_surface);
+    _glDisplay = std::make_unique<gl::Display>();
+    _glConfig = _glDisplay->chooseConfig();
+    _glContext = _glDisplay->makeContext(_glConfig, nullptr);
+    _glSurface = _glDisplay->makePixelBufferSurface(_glConfig, 1, 1);
+    _glContext->makeCurrent(_glSurface.get());
     auto backendInterface = GrGLMakeNativeInterface();
     _directContext = GrDirectContexts::MakeGL(backendInterface);
 
@@ -149,3 +153,5 @@ private:
     }
   }
 };
+
+} // namespace RNSkia

package/android/cpp/rnskia-android/OpenGLWindowContext.cpp

@@ -1,6 +1,8 @@
 #include "OpenGLWindowContext.h"
 #include "GrAHardwareBufferUtils.h"
 
+#include "OpenGLContext.h"
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
@@ -14,35 +16,14 @@ namespace RNSkia {
 
 sk_sp<SkSurface> OpenGLWindowContext::getSurface() {
   if (_skSurface == nullptr) {
-
-    struct ReleaseContext {
-      std::unique_ptr<Surface> surface = nullptr;
-    };
-
-    auto releaseCtx = new ReleaseContext();
-    releaseCtx->surface = _display->makeWindowSurface(_config, _window);
-    _surface = releaseCtx->surface.get();
-  
-    // Now make this one current
-    _context->makeCurrent(*releaseCtx->surface);
-
-    // Set up parameters for the render target so that it
-    // matches the underlying OpenGL context.
-    GrGLFramebufferInfo fboInfo;
-
-    // We pass 0 as the framebuffer id, since the
-    // underlying Skia GrGlGpu will read this when wrapping the context in the
-    // render target and the GrGlGpu object.
-    fboInfo.fFBOID = 0;
-    fboInfo.fFormat = 0x8058; // GL_RGBA8
-
+    _glContext->makeCurrent(_glSurface.get());
     GLint stencil;
     glGetIntegerv(GL_STENCIL_BITS, &stencil);
 
     GLint samples;
     glGetIntegerv(GL_SAMPLES, &samples);
 
-    auto colorType = kN32_SkColorType;
+    auto colorType = kRGBA_8888_SkColorType;
 
     auto maxSamples =
         _directContext->maxSurfaceSampleCountForColorType(colorType);
@@ -51,23 +32,30 @@ sk_sp<SkSurface> OpenGLWindowContext::getSurface() {
       samples = maxSamples;
     }
 
-    auto renderTarget = GrBackendRenderTargets::MakeGL(_width, _height, samples,
-                                                       stencil, fboInfo);
-
-    SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
-
-  
-    // Create surface object
+    GrGLFramebufferInfo fbInfo;
+    fbInfo.fFBOID = 0;
+    fbInfo.fFormat = GR_GL_RGBA8;
+    // fbInfo.fProtected =
+    // skgpu::Protected(fDisplayParams.fCreateProtectedNativeBackend);
+
+    auto width = ANativeWindow_getWidth(_window);
+    auto height = ANativeWindow_getHeight(_window);
+    auto backendRT =
+        GrBackendRenderTargets::MakeGL(width, height, samples, stencil, fbInfo);
+    sk_sp<SkColorSpace> colorSpace(nullptr);
+    SkSurfaceProps surfaceProps(0, kRGB_H_SkPixelGeometry);
     _skSurface = SkSurfaces::WrapBackendRenderTarget(
-        _directContext, renderTarget, kBottomLeft_GrSurfaceOrigin, colorType,
-        nullptr, &props,
-        [](void *addr) {
-          auto releaseCtx = reinterpret_cast<ReleaseContext *>(addr);
-          delete releaseCtx;
-        },
-        reinterpret_cast<void *>(releaseCtx));
+        _directContext.get(), backendRT, kBottomLeft_GrSurfaceOrigin,
+        kRGBA_8888_SkColorType, colorSpace, &surfaceProps);
   }
   return _skSurface;
 }
 
+void OpenGLWindowContext::present() {
+  _glContext->makeCurrent(_glSurface.get());
+  // TODO: is flushAndSubmit needed here?
+  _directContext->flushAndSubmit();
+  _glSurface->present();
+}
+
 } // namespace RNSkia

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

@@ -14,7 +14,7 @@
 #include <unordered_map>
 
 #include "WindowContext.h"
-#include "opengl/Display.h"
+#include "gl/Display.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -33,42 +33,39 @@ namespace RNSkia {
 
 class OpenGLWindowContext : public WindowContext {
 public:
-  OpenGLWindowContext(EGLConfig &config, Display *display, Context *context,
-                      GrDirectContext *directContext, ANativeWindow *window,
-                      int width, int height)
-      : _config(config), _display(display), _directContext(directContext),
-        _context(context), _window(window), _width(width), _height(height) {}
+  OpenGLWindowContext(sk_sp<GrDirectContext> directContext,
+                      gl::Display *display, gl::Context *glContext,
+                      ANativeWindow *window)
+      : _directContext(directContext), _display(display), _glContext(glContext),
+        _window(window) {
+    ANativeWindow_acquire(_window);
+    auto config = display->chooseConfig();
+    _glSurface = display->makeWindowSurface(config, _window);
+  }
 
-  ~OpenGLWindowContext() { ANativeWindow_release(_window); }
+  ~OpenGLWindowContext() {
+    _skSurface = nullptr;
+    _glSurface = nullptr;
+    ANativeWindow_release(_window);
+  }
 
   sk_sp<SkSurface> getSurface() override;
 
-  void present() override {
-    _context->makeCurrent(*_surface);
-    _directContext->flushAndSubmit();
-    _surface->Present();
-  }
+  void present() override;
 
-  void resize(int width, int height) override {
-    _skSurface = nullptr;
-    _width = width;
-    _height = height;
-  }
+  int getWidth() override { return ANativeWindow_getWidth(_window); };
 
-  int getWidth() override { return _width; };
+  int getHeight() override { return ANativeWindow_getHeight(_window); };
 
-  int getHeight() override { return _height; };
+  void resize(int width, int height) override { _skSurface = nullptr; }
 
 private:
+  sk_sp<GrDirectContext> _directContext;
+  gl::Display *_display;
   ANativeWindow *_window;
   sk_sp<SkSurface> _skSurface = nullptr;
-  EGLConfig _config;
-  Context *_context;
-  Surface* _surface;
-  Display *_display;
-  GrDirectContext *_directContext;
-  int _width = 0;
-  int _height = 0;
+  gl::Context *_glContext = nullptr;
+  std::unique_ptr<gl::Surface> _glSurface = nullptr;
 };
 
 } // namespace RNSkia

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

@@ -68,8 +68,8 @@ public:
 #if defined(SK_GRAPHITE)
     return DawnContext::getInstance().MakeWindow(surface, width, height);
 #else
-    return OpenGLContext::getInstance().MakeWindow(
-        reinterpret_cast<ANativeWindow *>(surface), width, height);
+    auto aWindow = reinterpret_cast<ANativeWindow *>(surface);
+    return OpenGLContext::getInstance().MakeWindow(aWindow, width, height);
 #endif
   }
 

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

@@ -15,7 +15,7 @@ public:
 
   virtual void surfaceDestroyed() = 0;
 
-  virtual void surfaceSizeChanged(int width, int height) = 0;
+  virtual void surfaceSizeChanged(jobject surface, int width, int height) = 0;
 
   virtual float getPixelDensity() = 0;
 
@@ -50,9 +50,9 @@ public:
         ->surfaceDestroyed();
   }
 
-  void surfaceSizeChanged(int width, int height) override {
+  void surfaceSizeChanged(jobject surface, int width, int height) override {
     std::static_pointer_cast<RNSkOpenGLCanvasProvider>(T::getCanvasProvider())
-        ->surfaceSizeChanged(width, height);
+        ->surfaceSizeChanged(surface, width, height);
     // This is only need for the first time to frame, this renderImmediate call
     // will invoke updateTexImage for the previous frame
     RNSkView::renderImmediate();

package/android/cpp/rnskia-android/RNSkOpenGLCanvasProvider.cpp

@@ -76,6 +76,10 @@ bool RNSkOpenGLCanvasProvider::renderToCanvas(
 
 void RNSkOpenGLCanvasProvider::surfaceAvailable(jobject jSurfaceTexture,
                                                 int width, int height) {
+  // If the surface is 0, we can skip it
+  if (width == 0 && height == 0) {
+    return;
+  }
   // Create renderer!
   JNIEnv *env = facebook::jni::Environment::current();
 
@@ -118,17 +122,22 @@ void RNSkOpenGLCanvasProvider::surfaceDestroyed() {
   }
 }
 
-void RNSkOpenGLCanvasProvider::surfaceSizeChanged(int width, int height) {
+void RNSkOpenGLCanvasProvider::surfaceSizeChanged(jobject jSurfaceTexture,
+                                                  int width, int height) {
   if (width == 0 && height == 0) {
     // Setting width/height to zero is nothing we need to care about when
     // it comes to invalidating the surface.
     return;
   }
 
-  // Recreate RenderContext surface based on size change???
-  _surfaceHolder->resize(width, height);
+  if (_surfaceHolder == nullptr) {
+    _surfaceHolder = nullptr;
+    surfaceAvailable(jSurfaceTexture, width, height);
+  } else {
+    _surfaceHolder->resize(width, height);
+  }
 
   // Redraw after size change
   _requestRedraw();
 }
-} // namespace RNSkia
+} // namespace RNSkia

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

@@ -31,7 +31,7 @@ public:
 
   void surfaceDestroyed();
 
-  void surfaceSizeChanged(int width, int height);
+  void surfaceSizeChanged(jobject jSurface, int width, int height);
 
 private:
   std::unique_ptr<WindowContext> _surfaceHolder = nullptr;

package/android/cpp/rnskia-android/{opengl → gl}/Context.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "opengl/Error.h"
-#include "opengl/Surface.h"
+#include "gl/Error.h"
+#include "gl/Surface.h"
 
-namespace RNSkia {
+namespace gl {
 
 class Surface;
 class Display;
@@ -22,20 +22,20 @@ public:
 
   const EGLContext &getHandle() const { return _context; }
 
-  bool makeCurrent(const Surface &surface) const {
+  bool makeCurrent(const Surface *surface) {
     if (_context == EGL_NO_CONTEXT) {
       return false;
     }
     const auto result =
-        eglMakeCurrentIfNecessary(_display, surface.getHandle(),
-                                  surface.getHandle(), _context) == EGL_TRUE;
+        eglMakeCurrentIfNecessary(_display, surface->getHandle(),
+                                  surface->getHandle(), _context) == EGL_TRUE;
     if (!result) {
       LOG_EGL_ERROR;
     }
     return result;
   }
 
-  bool clearCurrent() const {
+  bool clearCurrent() {
     const auto result =
         eglMakeCurrentIfNecessary(_display, EGL_NO_SURFACE, EGL_NO_SURFACE,
                                   EGL_NO_CONTEXT) == EGL_TRUE;
@@ -74,4 +74,4 @@ private:
   Context &operator=(const Context &) = delete;
 };
 
-} // namespace RNSkia
+} // namespace gl

package/android/cpp/rnskia-android/{opengl → gl}/Display.h

@@ -5,10 +5,10 @@
 #include "EGL/egl.h"
 #include "GLES2/gl2.h"
 
-#include "opengl/Context.h"
-#include "opengl/Error.h"
+#include "gl/Context.h"
+#include "gl/Error.h"
 
-namespace RNSkia {
+namespace gl {
 
 class Context;
 class Surface;
@@ -35,7 +35,11 @@ public:
 
   bool isValid() const { return _display != EGL_NO_DISPLAY; }
 
-  EGLConfig chooseConfig() const {
+  void clearContext() {
+    eglMakeCurrent(_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+  }
+
+  EGLConfig chooseConfig() {
 
     EGLint att[] = {EGL_RENDERABLE_TYPE,
                     EGL_OPENGL_ES2_BIT,
@@ -82,14 +86,14 @@ public:
   }
 
   std::unique_ptr<Surface> makeWindowSurface(const EGLConfig &config,
-                                             EGLNativeWindowType window) {
+                                             ANativeWindow *window) {
     const EGLint attribs[] = {EGL_NONE};
     auto surface = eglCreateWindowSurface(_display, config, window, attribs);
     if (surface == EGL_NO_SURFACE) {
       LOG_EGL_ERROR;
       return nullptr;
     }
-    return std::unique_ptr<Surface>(new Surface(_display, surface));
+    return std::make_unique<Surface>(_display, surface);
   }
 
   std::unique_ptr<Surface> makePixelBufferSurface(const EGLConfig &config,
@@ -101,7 +105,7 @@ public:
       LOG_EGL_ERROR;
       return nullptr;
     }
-    return std::unique_ptr<Surface>(new Surface(_display, surface));
+    return std::make_unique<Surface>(_display, surface);
   }
 
   const EGLDisplay &getHandle() const { return _display; }
@@ -114,4 +118,4 @@ private:
   Display &operator=(const Display &) = delete;
 };
 
-} // namespace RNSkia
+} // namespace gl

package/android/cpp/rnskia-android/{opengl → gl}/Error.cpp

@@ -1,4 +1,4 @@
-#include "opengl/Error.h"
+#include "gl/Error.h"
 
 #include "RNSkLog.h"
 

package/android/cpp/rnskia-android/{opengl → gl}/Surface.h

@@ -1,11 +1,14 @@
 #pragma once
 
-#include "opengl/Error.h"
+#include "gl/Error.h"
 
-namespace RNSkia {
+namespace gl {
 
 class Surface {
 public:
+  Surface(EGLDisplay display, EGLSurface surface)
+      : _display(display), _surface(surface) {}
+
   ~Surface() {
     if (_surface != EGL_NO_SURFACE) {
       if (eglDestroySurface(_display, _surface) != EGL_TRUE) {
@@ -18,7 +21,7 @@ public:
 
   const EGLSurface &getHandle() const { return _surface; }
 
-  bool Present() const {
+  bool present() {
     const auto result = eglSwapBuffers(_display, _surface) == EGL_TRUE;
     if (!result) {
       LOG_EGL_ERROR;
@@ -32,12 +35,9 @@ private:
   EGLDisplay _display = EGL_NO_DISPLAY;
   EGLSurface _surface = EGL_NO_SURFACE;
 
-  Surface(EGLDisplay display, EGLSurface surface)
-      : _display(display), _surface(surface) {}
-
   Surface(const Surface &) = delete;
 
   Surface &operator=(const Surface &) = delete;
 };
 
-} // Namespace RNSkia
+} // Namespace gl

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

@@ -64,7 +64,7 @@ public abstract class SkiaBaseView extends ReactViewGroup implements TextureView
             return;
         }
         Log.i(tag, "onSurfaceTextureSizeChanged " + width + "/" + height);
-        surfaceSizeChanged(width, height);
+        surfaceSizeChanged(surface, width, height);
     }
 
     @Override
@@ -82,18 +82,18 @@ public abstract class SkiaBaseView extends ReactViewGroup implements TextureView
         return false;
     }
 
-    //private long _prevTimestamp = 0;
+    private long _prevTimestamp = 0;
     @Override
     public void onSurfaceTextureUpdated(SurfaceTexture surface) {
-//        long timestamp = surface.getTimestamp();
-//        long frameDuration = (timestamp - _prevTimestamp)/1000000;
-//        Log.i(tag, "onSurfaceTextureUpdated "+frameDuration+"ms");
-//        _prevTimestamp = timestamp;
+        long timestamp = surface.getTimestamp();
+        long frameDuration = (timestamp - _prevTimestamp)/1000000;
+        Log.i(tag, "onSurfaceTextureUpdated "+frameDuration+"ms");
+        _prevTimestamp = timestamp;
     }
 
     protected abstract void surfaceAvailable(Object surface, int width, int height);
 
-    protected abstract void surfaceSizeChanged(int width, int height);
+    protected abstract void surfaceSizeChanged(Object surface, int width, int height);
 
     protected abstract void surfaceDestroyed();
 

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

@@ -27,7 +27,7 @@ public class SkiaDomView extends SkiaBaseView {
 
     protected native void surfaceAvailable(Object surface, int width, int height);
 
-    protected native void surfaceSizeChanged(int width, int height);
+    protected native void surfaceSizeChanged(Object surface, int width, int height);
 
     protected native void surfaceDestroyed();
 
@@ -37,8 +37,6 @@ public class SkiaDomView extends SkiaBaseView {
 
     protected native void setDebugMode(boolean show);
 
-    protected native void updateTouchPoints(double[] points);
-
     protected native void registerView(int nativeId);
 
     protected native void unregisterView();

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

@@ -26,7 +26,7 @@ public class SkiaPictureView extends SkiaBaseView {
 
     protected native void surfaceAvailable(Object surface, int width, int height);
 
-    protected native void surfaceSizeChanged(int width, int height);
+    protected native void surfaceSizeChanged(Object surface, int width, int height);
 
     protected native void surfaceDestroyed();
 
@@ -36,8 +36,6 @@ public class SkiaPictureView extends SkiaBaseView {
 
     protected native void setDebugMode(boolean show);
 
-    protected native void updateTouchPoints(double[] points);
-
     protected native void registerView(int nativeId);
 
     protected native void unregisterView();

package/cpp/api/JsiSkiaContext.h

@@ -69,6 +69,9 @@ public:
       void *surface = reinterpret_cast<void *>(nativeBufferPointer);
       auto width = static_cast<int>(arguments[1].asNumber());
       auto height = static_cast<int>(arguments[2].asNumber());
+      if (surface == nullptr) {
+        throw std::runtime_error("Surface is null");
+      }
       auto result =
           context->makeContextFromNativeSurface(surface, width, height);
       // Return the newly constructed object

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm

@@ -77,6 +77,9 @@ bool RNSkMetalCanvasProvider::renderToCanvas(
   // usage growing very fast in the simulator without this.
   @autoreleasepool {
     auto surface = _ctx->getSurface();
+    if (!surface) {
+      return false;
+    }
     auto canvas = surface->getCanvas();
     cb(canvas);
     _ctx->present();

package/ios/RNSkia-iOS/SkiaCVPixelBufferUtils.mm

@@ -23,12 +23,16 @@
 #include <TargetConditionals.h>
 #if TARGET_RT_BIG_ENDIAN
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]){*((char *)&fourcc), *(((char *)&fourcc) + 1),                 \
-                 *(((char *)&fourcc) + 2), *(((char *)&fourcc) + 3), 0}
+  (const char[]) {                                                             \
+    *((char *)&fourcc), *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 2),    \
+        *(((char *)&fourcc) + 3), 0                                            \
+  }
 #else
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]){*(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),           \
-                 *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0}
+  (const char[]) {                                                             \
+    *(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),                        \
+        *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0                  \
+  }
 #endif
 
 // pragma MARK: TextureHolder

package/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.h

@@ -107,8 +107,6 @@ public:
     _skSurface = nullptr;
   }
 
-  void resize(int width, int height) override { _skSurface = nullptr; }
-
   int getWidth() override {
     return _layer.frame.size.width * _layer.contentsScale;
   };
@@ -117,6 +115,8 @@ public:
     return _layer.frame.size.height * _layer.contentsScale;
   };
 
+  void resize(int width, int height) override { _skSurface = nullptr; }
+
 private:
   SkiaMetalContext *_context;
   sk_sp<SkSurface> _skSurface = nullptr;

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaDrawViewManagerInterface.java

@@ -1,18 +0,0 @@
-/**
-* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
-*
-* Do not edit this file as changes may cause incorrect behavior and will be lost
-* once the code is regenerated.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-
-public interface SkiaDrawViewManagerInterface<T extends View> {
-  void setMode(T view, @Nullable String value);
-  void setDebug(T view, boolean value);
-}