🔧

Shopify · Nov 20, 2024 · 8afeef3 · 8afeef3
1 parent bc09a44
commit 8afeef3
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/packages/skia/android/cpp/rnskia-android/OpenGLWindowContext.cpp b/packages/skia/android/cpp/rnskia-android/OpenGLWindowContext.cpp
@@ -21,6 +21,9 @@ sk_sp<SkSurface> OpenGLWindowContext::getSurface() {
       std::unique_ptr<gl::Surface> surface = nullptr;
     };
 
+    if (!_window) {
+      throw std::runtime_error("No native window provided");
+    }
     auto releaseCtx = new ReleaseContext();
     releaseCtx->surface =
         _context->_glDisplay->makeWindowSurface(_context->_glConfig, _window);

diff --git a/packages/skia/android/cpp/rnskia-android/OpenGLWindowContext.h b/packages/skia/android/cpp/rnskia-android/OpenGLWindowContext.h
@@ -37,9 +37,15 @@ class OpenGLWindowContext : public WindowContext {
 public:
   OpenGLWindowContext(OpenGLContext *context, ANativeWindow *window, int width,
                       int height)
-      : _context(context), _window(window), _width(width), _height(height) {}
+      : _context(context), _window(window), _width(width), _height(height) {
+    ANativeWindow_acquire(_window);
+  }
 
-  ~OpenGLWindowContext() = default;
+  ~OpenGLWindowContext() {
+    _skSurface = nullptr;
+    _glSurface = nullptr;
+    ANativeWindow_release(_window);
+  }
 
   sk_sp<SkSurface> getSurface() override;
 

diff --git a/packages/skia/android/cpp/rnskia-android/RNSkAndroidPlatformContext.h b/packages/skia/android/cpp/rnskia-android/RNSkAndroidPlatformContext.h
@@ -68,8 +68,8 @@ class RNSkAndroidPlatformContext : public RNSkPlatformContext {
 #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
   }
 

diff --git a/packages/skia/android/cpp/rnskia-android/gl/Context.h b/packages/skia/android/cpp/rnskia-android/gl/Context.h
@@ -22,7 +22,7 @@ class Context {
 
   const EGLContext &getHandle() const { return _context; }
 
-  bool makeCurrent(const Surface* surface) {
+  bool makeCurrent(const Surface *surface) {
     if (_context == EGL_NO_CONTEXT) {
       return false;
     }

diff --git a/packages/skia/android/cpp/rnskia-android/gl/Display.h b/packages/skia/android/cpp/rnskia-android/gl/Display.h
@@ -82,7 +82,7 @@ class Display {
   }
 
   std::unique_ptr<Surface> makeWindowSurface(const EGLConfig &config,
-                                             ANativeWindow* window) {
+                                             ANativeWindow *window) {
     const EGLint attribs[] = {EGL_NONE};
     auto surface = eglCreateWindowSurface(_display, config, window, attribs);
     if (surface == EGL_NO_SURFACE) {

diff --git a/packages/skia/android/cpp/rnskia-android/gl/Surface.h b/packages/skia/android/cpp/rnskia-android/gl/Surface.h
@@ -6,7 +6,8 @@ namespace gl {
 
 class Surface {
 public:
-  Surface(EGLDisplay display, EGLSurface surface): _display(display), _surface(surface) {}
+  Surface(EGLDisplay display, EGLSurface surface)
+      : _display(display), _surface(surface) {}
 
   ~Surface() {
     if (_surface != EGL_NO_SURFACE) {

diff --git a/packages/skia/cpp/api/JsiSkiaContext.h b/packages/skia/cpp/api/JsiSkiaContext.h
@@ -69,6 +69,9 @@ class JsiSkiaContext : public JsiSkWrappingSharedPtrHostObject<WindowContext> {
       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