@shopify/react-native-skia 0.1.122 → 0.1.123

package/android/CMakeLists.txt

@@ -31,7 +31,8 @@ add_library(
         "${PROJECT_SOURCE_DIR}/cpp/jni/JniSkiaManager.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/jni/JniSkiaDrawView.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/jni/JniPlatformContext.cpp"
-        "${PROJECT_SOURCE_DIR}/cpp/jni/SkiaOpenGLRenderer.cpp"
+        "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/RNSkDrawViewImpl.cpp"
+        "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/SkiaOpenGLRenderer.cpp"
         
         "${PROJECT_SOURCE_DIR}/cpp/jsi/JsiHostObject.cpp"
 
@@ -64,6 +65,7 @@ target_include_directories(
         cpp/api
         cpp/jsi
         cpp/jni/include
+        cpp/rnskia-android
         cpp/rnskia
         cpp/rnskia/values
         cpp/utils  

package/android/cpp/jni/JniSkiaDrawView.cpp

@@ -31,16 +31,13 @@ namespace RNSkia
     /**** DTOR ***/
     JniSkiaDrawView::~JniSkiaDrawView()
     {
-#if LOG_ALL_DRAWING
-        RNSkLogger::logToConsole("JniSkiaDrawView::~JniSkiaDrawView %i", getNativeId());
-#endif
     }
 
     /**** JNI ****/
 
     TSelf JniSkiaDrawView::initHybrid(
-        alias_ref<HybridClass::jhybridobject> jThis,
-        JavaSkiaManager skiaManager)
+            alias_ref<HybridClass::jhybridobject> jThis,
+            JavaSkiaManager skiaManager)
     {
         return makeCxxInstance(jThis, skiaManager);
     }
@@ -60,17 +57,17 @@ namespace RNSkia
     {
         if (mode.compare("continuous") == 0)
         {
-            setDrawingMode(RNSkDrawingMode::Continuous);
+            _drawView->setDrawingMode(RNSkDrawingMode::Continuous);
         }
         else
         {
-            setDrawingMode(RNSkDrawingMode::Default);
+            _drawView->setDrawingMode(RNSkDrawingMode::Default);
         }
     }
 
     void JniSkiaDrawView::setDebugMode(bool show)
     {
-        setShowDebugOverlays(show);
+        _drawView->setShowDebugOverlays(show);
     }
 
     void JniSkiaDrawView::updateTouchPoints(jni::JArrayDouble touches)
@@ -78,7 +75,7 @@ namespace RNSkia
         // Create touch points
         std::vector<RNSkia::RNSkTouchPoint> points;
         auto pin = touches.pin();
-        auto scale = getPlatformContext()->getPixelDensity();
+        auto scale = _drawView->getPixelDensity();
         points.reserve(pin.size() / 4);
         for (size_t i = 0; i < pin.size(); i += 4)
         {
@@ -89,81 +86,27 @@ namespace RNSkia
             point.type = (RNSkia::RNSkTouchType)pin[i + 3];
             points.push_back(point);
         }
-        updateTouchState(std::move(points));
+        _drawView->updateTouchState(std::move(points));
     }
 
     void JniSkiaDrawView::surfaceAvailable(jobject surface, int width, int height)
     {
-#if LOG_ALL_DRAWING
-        RNSkLogger::logToConsole("JniSkiaDrawView::surfaceAvailable %i", getNativeId());
-#endif
-
-        _width = width;
-        _height = height;
-
-        if (_renderer == nullptr)
-        {
-            // Create renderer!
-            _renderer = new SkiaOpenGLRenderer(
-                ANativeWindow_fromSurface(Environment::current(), surface), getNativeId());
-
-            // Set the draw function
-            setNativeDrawFunc(std::bind(&JniSkiaDrawView::drawFrame, this, std::placeholders::_1));
-
-            // Redraw
-            requestRedraw();
-        }
+        _drawView->surfaceAvailable(ANativeWindow_fromSurface(Environment::current(), surface), width, height);
     }
 
     void JniSkiaDrawView::surfaceSizeChanged(int width, int height)
     {
-#if LOG_ALL_DRAWING
-        RNSkLogger::logToConsole("JniSkiaDrawView::surfaceSizeChanged %i", getNativeId());
-#endif
-
-        _width = width;
-        _height = height;
-
-        // Redraw after size change
-        requestRedraw();
+        _drawView->surfaceSizeChanged(width, height);
     }
 
     void JniSkiaDrawView::surfaceDestroyed()
     {
-#if LOG_ALL_DRAWING
-        RNSkLogger::logToConsole("JniSkiaDrawView::surfaceDestroyed %i", getNativeId());
-#endif
-        if (_renderer != nullptr)
-        {
-            // Turn off drawing
-            setNativeDrawFunc(nullptr);
-
-            // Start teardown
-            _renderer->teardown();
-
-            // Ask for a redraw to tear down the render pipeline. This
-            // needs to be done on the render thread since OpenGL demands
-            // same thread access for OpenGL contexts.
-            getPlatformContext()->runOnRenderThread([this]()
-                                                    {
-                if(_renderer != nullptr) {
-                    _renderer->run(nullptr, 0, 0);
-                } });
-
-            // Wait until the above render has finished.
-            _renderer->waitForTeardown();
-
-            // Delete renderer. All resources should be released during teardown.
-            delete _renderer;
-            _renderer = nullptr;
-        }
+        _drawView->surfaceDestroyed();
     }
 
-    /**** Render method ****/
-
-    void JniSkiaDrawView::drawFrame(const sk_sp<SkPicture> picture)
-    {
-        // No need to check if the renderer is nullptr since we only get here if it is not.
-        _renderer->run(picture, _width, _height);
+    void JniSkiaDrawView::releaseSurface() {
+        jni::ThreadScope ts;
+        static auto method = javaPart_->getClass()->getMethod<void(void)>("releaseSurface");
+        method(javaPart_.get());
     }
 } // namespace RNSkia

package/android/cpp/jni/JniSkiaManager.cpp

@@ -47,7 +47,7 @@ void JniSkiaManager::initializeRuntime() {
 }
 
 void JniSkiaManager::registerSkiaView(int viewTag, JniSkiaDrawView *skiaView) {
-    _skManager->registerSkiaDrawView(viewTag, skiaView);
+    _skManager->registerSkiaDrawView(viewTag, skiaView->getDrawViewImpl());
 }
 
 void JniSkiaManager::unregisterSkiaView(int viewTag) {

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

@@ -5,17 +5,16 @@
 #include <thread>
 #include <string>
 
-#include <EGL/egl.h>
-#include <GLES2/gl2.h>
 #include <fbjni/fbjni.h>
 #include <jni.h>
 #include <jsi/jsi.h>
 #include <thread>
 
 #include <RNSkDrawView.h>
-#include "JniSkiaManager.h"
-#include "JniSkiaDrawView.h"
-#include "SkiaOpenGLRenderer.h"
+#include <JniSkiaManager.h>
+#include <JniSkiaDrawView.h>
+
+#include <RNSkDrawViewImpl.h>
 
 #include <SkSurface.h>
 #include <SkRefCnt.h>
@@ -31,16 +30,15 @@ namespace RNSkia
 
     using JavaSkiaManager = jni::alias_ref<JniSkiaManager::javaobject>;
 
-    class JniSkiaDrawView : public jni::HybridClass<JniSkiaDrawView>,
-                            public RNSkDrawView
+    class JniSkiaDrawView : public jni::HybridClass<JniSkiaDrawView>
     {
     public:
         static auto constexpr kJavaDescriptor = "Lcom/shopify/reactnative/skia/SkiaDrawView;";
         static auto constexpr TAG = "ReactNativeSkia";
 
         static jni::local_ref<jhybriddata> initHybrid(
-            jni::alias_ref<jhybridobject>,
-            JavaSkiaManager);
+                jni::alias_ref<jhybridobject>,
+                JavaSkiaManager);
 
         static void registerNatives();
 
@@ -52,30 +50,28 @@ namespace RNSkia
 
         ~JniSkiaDrawView();
 
-    protected:
-        int getWidth() override { return _width; }
-        int getHeight() override { return _height; }
+        std::shared_ptr<RNSkDrawView> getDrawViewImpl() { return _drawView; }
+
+        void releaseSurface();
 
+    protected:
         void setMode(std::string mode);
         void setDebugMode(bool show);
 
     private:
         friend HybridBase;
 
-        void drawFrame(const sk_sp<SkPicture> picture);
-
-        int _width = 0;
-        int _height = 0;
-
-        SkiaOpenGLRenderer* _renderer = nullptr;
+        std::shared_ptr<RNSkDrawViewImpl> _drawView;
 
         jni::global_ref<JniSkiaDrawView::javaobject> javaPart_;
 
         explicit JniSkiaDrawView(
-            jni::alias_ref<JniSkiaDrawView::jhybridobject> jThis,
-            JavaSkiaManager skiaManager)
-            : javaPart_(jni::make_global(jThis)),
-              RNSkDrawView(skiaManager->cthis()->getPlatformContext()) {
+                jni::alias_ref<JniSkiaDrawView::jhybridobject> jThis,
+                JavaSkiaManager skiaManager)
+                : javaPart_(jni::make_global(jThis)),
+                  _drawView(std::make_shared<RNSkDrawViewImpl>(skiaManager->cthis()->getPlatformContext(), [this]() {
+                      releaseSurface();
+                  })) {
         }
     };
 

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

@@ -7,7 +7,7 @@
 #include <memory>
 
 #include <JniPlatformContext.h>
-#include <JniPlatformContextWrapper.h>
+#include <RNSkPlatformContextImpl.h>
 
 #include <RNSkLog.h>
 
@@ -48,14 +48,14 @@ class JniSkiaManager : public jni::HybridClass<JniSkiaManager> {
         : _javaPart(jni::make_global(jThis)),
           _jsRuntime(runtime),
           _jsCallInvoker(jsCallInvoker),
-          _context(std::make_shared<JniPlatformContextWrapper>(platformContext, runtime, jsCallInvoker)) {
+          _context(std::make_shared<RNSkPlatformContextImpl>(platformContext, runtime, jsCallInvoker)) {
 
     }
 
     void registerSkiaView(int viewTag, JniSkiaDrawView *skiaView);
     void unregisterSkiaView(int viewTag);
 
-    std::shared_ptr<JniPlatformContextWrapper> getPlatformContext() { return _context; }
+    std::shared_ptr<RNSkPlatformContextImpl> getPlatformContext() { return _context; }
 
     void invalidate() {
         _context->stopDrawLoop();
@@ -73,7 +73,7 @@ class JniSkiaManager : public jni::HybridClass<JniSkiaManager> {
 
     jsi::Runtime *_jsRuntime;
     std::shared_ptr<facebook::react::CallInvoker> _jsCallInvoker;
-    std::shared_ptr<JniPlatformContextWrapper> _context;
+    std::shared_ptr<RNSkPlatformContextImpl> _context;
 
     void initializeRuntime();
 };

package/android/cpp/rnskia-android/RNSkDrawViewImpl.cpp

@@ -0,0 +1,68 @@
+#include <RNSkDrawViewImpl.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include <SkSurface.h>
+#include <SkCanvas.h>
+
+#pragma clang diagnostic pop
+
+#include <RNSkLog.h>
+
+namespace RNSkia {
+    RNSkDrawViewImpl::RNSkDrawViewImpl(std::shared_ptr <RNSkia::RNSkPlatformContext> context, std::function<void()> releaseSurfaceCallback) :
+        RNSkia::RNSkDrawView(context),
+        _releaseSurfaceCallback(std::move(releaseSurfaceCallback)) {}
+
+    void RNSkDrawViewImpl::surfaceAvailable(ANativeWindow* surface, int width, int height) {
+        _width = width;
+        _height = height;
+
+        if (_renderer == nullptr)
+        {
+            // Create renderer!
+            _renderer = std::make_unique<SkiaOpenGLRenderer>(surface, getNativeId());
+
+            // Redraw
+            requestRedraw();
+        }
+    }
+
+    void RNSkDrawViewImpl::surfaceDestroyed() {
+        if (_renderer != nullptr)
+        {
+            // Start teardown
+            _renderer->teardown();
+
+            // Teardown renderer on the render thread since OpenGL demands
+            // same thread access for OpenGL contexts.
+            getPlatformContext()->runOnRenderThread([weakSelf = weak_from_this()]() {
+                auto self = weakSelf.lock();
+                if(self) {
+                    auto drawViewImpl = std::dynamic_pointer_cast<RNSkDrawViewImpl>(self);
+                    if(drawViewImpl->_renderer != nullptr) {
+                        drawViewImpl->_renderer->run(nullptr, 0, 0);
+                    }
+                    // Remove renderer
+                    drawViewImpl->_renderer = nullptr;
+                    drawViewImpl->_releaseSurfaceCallback();
+                }
+            });
+        }
+    }
+
+    void RNSkDrawViewImpl::surfaceSizeChanged(int width, int height) {
+        _width = width;
+        _height = height;
+
+        // Redraw after size change
+        requestRedraw();
+    }
+
+    void RNSkDrawViewImpl::drawPicture(const sk_sp <SkPicture> picture) {
+        if(_renderer != nullptr) {
+            _renderer->run(picture, _width, _height);
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+#pragma once
+
+#include <RNSkDrawView.h>
+
+#include <SkiaOpenGLRenderer.h>
+#include <android/native_window.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include <SkPicture.h>
+#include <SkRefCnt.h>
+
+#pragma clang diagnostic pop
+
+namespace RNSkia {
+    class RNSkDrawViewImpl : public RNSkia::RNSkDrawView {
+    public:
+        RNSkDrawViewImpl(std::shared_ptr <RNSkia::RNSkPlatformContext> context,
+                         std::function<void()> releaseSurfaceCallback);
+
+        void surfaceAvailable(ANativeWindow* surface, int, int);
+        void surfaceDestroyed();
+        void surfaceSizeChanged(int, int);
+
+        float getPixelDensity() {
+            return getPlatformContext()->getPixelDensity();
+        }
+
+    protected:
+        int getWidth() override { return _width * getPlatformContext()->getPixelDensity(); };
+
+        int getHeight() override { return _height * getPlatformContext()->getPixelDensity(); };
+
+        void drawPicture(const sk_sp <SkPicture> picture) override;
+
+    private:
+        bool createSkiaSurface();
+
+        std::unique_ptr<SkiaOpenGLRenderer> _renderer = nullptr;
+
+        int _nativeId;
+        int _width = -1;
+        int _height = -1;
+
+        std::function<void()> _releaseSurfaceCallback;
+    };
+}

package/android/cpp/{jni/include/JniPlatformContextWrapper.h → rnskia-android/RNSkPlatformContextImpl.h}

@@ -11,11 +11,11 @@
 namespace RNSkia {
     using namespace facebook;
 
-    class JniPlatformContextWrapper: public RNSkPlatformContext {
+    class RNSkPlatformContextImpl: public RNSkPlatformContext {
     public:
-        JniPlatformContextWrapper(JniPlatformContext* jniPlatformContext,
-                                  jsi::Runtime *runtime,
-                                  std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker) :
+        RNSkPlatformContextImpl(JniPlatformContext* jniPlatformContext,
+                                jsi::Runtime *runtime,
+                                std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker) :
             RNSkPlatformContext(runtime,
                                 jsCallInvoker,
                                 jniPlatformContext->getPixelDensity()),

package/android/cpp/{jni → rnskia-android}/SkiaOpenGLRenderer.cpp

@@ -1,9 +1,9 @@
 #include "SkiaOpenGLRenderer.h"
 
 #include <RNSkLog.h>
+
 namespace RNSkia
 {
-
     /** Static members */
     std::shared_ptr<DrawingContext> SkiaOpenGLRenderer::getThreadDrawingContext()
     {
@@ -20,6 +20,11 @@ namespace RNSkia
         return threadContexts.at(threadId);
     }
 
+    SkiaOpenGLRenderer::SkiaOpenGLRenderer(ANativeWindow *surface, size_t renderId):
+        _surfaceTexture(surface),
+        _renderId(renderId) {
+    }
+
     void SkiaOpenGLRenderer::run(const sk_sp<SkPicture> picture, int width, int height)
     {
         switch (_renderState)
@@ -73,7 +78,16 @@ namespace RNSkia
         }
         case RenderState::Finishing:
         {
-            finish();
+            _renderState = RenderState::Done;
+
+            if (_glSurface != EGL_NO_SURFACE && getThreadDrawingContext()->glDisplay != EGL_NO_DISPLAY)
+            {
+                eglDestroySurface(getThreadDrawingContext()->glDisplay, _glSurface);
+            }
+
+            _skSurface = nullptr;
+            _surfaceTexture = nullptr;
+
             break;
         }
         case RenderState::Done:
@@ -107,58 +121,11 @@ namespace RNSkia
         return true;
     }
 
-    void SkiaOpenGLRenderer::finish()
-    {
-        std::lock_guard<std::mutex> lock(_lock);
-
-        if (_renderState != RenderState::Finishing)
-        {
-            _cv.notify_all();
-            return;
-        }
-
-        finishGL();
-        finishSkiaSurface();
-
-        _renderState = RenderState::Done;
-
-        _cv.notify_one();
-    }
-
-    void SkiaOpenGLRenderer::finishGL()
-    {
-        if (_glSurface != EGL_NO_SURFACE && getThreadDrawingContext()->glDisplay != EGL_NO_DISPLAY)
-        {
-            eglDestroySurface(getThreadDrawingContext()->glDisplay, _glSurface);
-        }
-    }
-
-    void SkiaOpenGLRenderer::finishSkiaSurface()
-    {
-        if (_skSurface != nullptr)
-        {
-            _skSurface = nullptr;
-        }
-
-        if (_nativeWindow != nullptr)
-        {
-            ANativeWindow_release(_nativeWindow);
-            _nativeWindow = nullptr;
-        }
-    }
-
     void SkiaOpenGLRenderer::teardown()
     {
         _renderState = RenderState::Finishing;
     }
 
-    void SkiaOpenGLRenderer::waitForTeardown()
-    {
-        std::unique_lock<std::mutex> lock(_lock);
-        _cv.wait(lock, [this]
-                 { return (_renderState == RenderState::Done); });
-    }
-
     bool SkiaOpenGLRenderer::initStaticGLContext()
     {
         if (getThreadDrawingContext()->glContext != EGL_NO_CONTEXT)
@@ -212,7 +179,12 @@ namespace RNSkia
 
         EGLint contextAttribs[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
 
-        getThreadDrawingContext()->glContext = eglCreateContext(getThreadDrawingContext()->glDisplay, getThreadDrawingContext()->glConfig, NULL, contextAttribs);
+        getThreadDrawingContext()->glContext = eglCreateContext(
+                getThreadDrawingContext()->glDisplay,
+                getThreadDrawingContext()->glConfig,
+                NULL,
+                contextAttribs);
+
         if (getThreadDrawingContext()->glContext == EGL_NO_CONTEXT)
         {
             RNSkLogger::logToConsole(
@@ -244,14 +216,18 @@ namespace RNSkia
 
     bool SkiaOpenGLRenderer::initGLSurface()
     {
-        if (_nativeWindow == nullptr)
+        if (_surfaceTexture == nullptr)
         {
             return false;
         }
 
         if (_glSurface != EGL_NO_SURFACE)
         {
-            if (!eglMakeCurrent(getThreadDrawingContext()->glDisplay, _glSurface, _glSurface, getThreadDrawingContext()->glContext))
+            if (!eglMakeCurrent(
+                    getThreadDrawingContext()->glDisplay,
+                    _glSurface,
+                    _glSurface,
+                    getThreadDrawingContext()->glContext))
             {
                 RNSkLogger::logToConsole(
                     "eglMakeCurrent failed: %d\n", eglGetError());
@@ -262,7 +238,12 @@ namespace RNSkia
 
         // Create the opengl surface
         _glSurface =
-            eglCreateWindowSurface(getThreadDrawingContext()->glDisplay, getThreadDrawingContext()->glConfig, _nativeWindow, nullptr);
+            eglCreateWindowSurface(
+                    getThreadDrawingContext()->glDisplay,
+                    getThreadDrawingContext()->glConfig,
+                    _surfaceTexture,
+                    nullptr);
+
         if (_glSurface == EGL_NO_SURFACE)
         {
             RNSkLogger::logToConsole(
@@ -270,7 +251,11 @@ namespace RNSkia
             return false;
         }
 
-        if (!eglMakeCurrent(getThreadDrawingContext()->glDisplay, _glSurface, _glSurface, getThreadDrawingContext()->glContext))
+        if (!eglMakeCurrent(
+                getThreadDrawingContext()->glDisplay,
+                _glSurface,
+                _glSurface,
+                getThreadDrawingContext()->glContext))
         {
             RNSkLogger::logToConsole("eglMakeCurrent failed: %d\n", eglGetError());
             return false;

package/android/cpp/{jni/include → rnskia-android}/SkiaOpenGLRenderer.h

@@ -7,7 +7,6 @@
 #include "GLES2/gl2.h"
 
 #include <condition_variable>
-#include <mutex>
 #include <thread>
 #include <unordered_map>
 
@@ -45,9 +44,7 @@ namespace RNSkia
     class SkiaOpenGLRenderer
     {
     public:
-        SkiaOpenGLRenderer(ANativeWindow *nativeWindow, size_t renderId) :
-            _nativeWindow(nativeWindow),
-            _renderId(renderId) { }
+        SkiaOpenGLRenderer(ANativeWindow *surface, size_t renderId);
 
         /**
          * Initializes, renders and tears down the render pipeline depending on the state of the
@@ -71,14 +68,6 @@ namespace RNSkia
          */
         void teardown();
 
-        /**
-         * Wait for teardown to finish. This means that we'll wait until the next
-         * render which will handle releasing all OpenGL and Skia resources used for
-         * this renderer. After tearing down the render will do nothing if the render
-         * method is called again.
-         */
-        void waitForTeardown();
-
     private:
         /**
          * Initializes all required OpenGL and Skia objects
@@ -117,21 +106,6 @@ namespace RNSkia
          */
         bool ensureSkiaSurface(int width, int height);
 
-        /**
-         * Finalizes and releases all resources used by this renderer
-         */
-        void finish();
-
-        /**
-         * Destroys the underlying OpenGL surface used for this renderer
-         */
-        void finishGL();
-
-        /**
-         * Destroys the underlying Skia surface used for this renderer
-         */
-        void finishSkiaSurface();
-
         /**
          * To be able to use static contexts (and avoid reloading the skia context for each
          * new view, we track the OpenGL and Skia drawing context per thread.
@@ -141,7 +115,7 @@ namespace RNSkia
 
         EGLSurface _glSurface = EGL_NO_SURFACE;
 
-        ANativeWindow *_nativeWindow = nullptr;
+        ANativeWindow *_surfaceTexture = nullptr;
         GrBackendRenderTarget _skRenderTarget;
         sk_sp<SkSurface> _skSurface;
 
@@ -150,9 +124,6 @@ namespace RNSkia
 
         size_t _renderId;
 
-        std::mutex _lock;
-        std::condition_variable _cv;
-
         std::atomic<RenderState> _renderState = { RenderState::Initializing };
     };
 

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

@@ -61,7 +61,7 @@ public class RNSkiaViewManager extends BaseViewManager<SkiaDrawView, LayoutShado
         Integer nativeId = mViewMapping.get(view);
         skiaModule.getSkiaManager().unregister(nativeId);
         mViewMapping.remove(view);
-        view.onRemoved();
+        view.onViewRemoved();
     }
 
     @NonNull