@shopify/react-native-skia 0.1.120 → 0.1.123

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/PlatformContext.java

@@ -66,7 +66,7 @@ public class PlatformContext {
         Choreographer.getInstance().postFrameCallback(frameCallback);
     }
 
-    public void raise(String message) {
+    public void raise(final String message) {
         new Handler(Looper.getMainLooper()).post(new Runnable() {
             @Override
             public void run() {

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

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

@@ -18,10 +18,11 @@ public class SkiaDrawView extends TextureView implements TextureView.SurfaceText
     @DoNotStrip
     private HybridData mHybridData;
 
-    private Surface mSurface;
+    @DoNotStrip
+    private boolean mViewRemoved;
 
     @DoNotStrip
-    private boolean mIsRemoved = false;
+    private Surface mSurface;
 
     public SkiaDrawView(Context ctx) {
         super(ctx);
@@ -36,26 +37,25 @@ public class SkiaDrawView extends TextureView implements TextureView.SurfaceText
         // Texture view does not support setting the background color.
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        mHybridData.resetNative();
-        super.finalize();
+    public void releaseSurface() {
+        if(mSurface != null) {
+            mSurface.release();
+            mSurface = null;
+        }
+        // We can only reset the native side when the view was removed from screen.
+        // releasing the surface can also be done when the view is hidden and then
+        // we should only release the surface - and keep the native part around.
+        if(mViewRemoved) {
+            mHybridData.resetNative();
+        }
     }
 
-
-    public void onRemoved() {
-        // We'll mark the view removed since we reset the native part.
-        // This means that none of the native methods should be called after
-        // this point.
-        mIsRemoved = true;
-        mHybridData.resetNative();
+    void onViewRemoved() {
+        mViewRemoved = true;
     }
 
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
-        if(mIsRemoved) {
-            return false;
-        }
         int action = ev.getAction();
         int count = ev.getPointerCount();
         MotionEvent.PointerCoords r = new MotionEvent.PointerCoords();
@@ -88,30 +88,23 @@ public class SkiaDrawView extends TextureView implements TextureView.SurfaceText
 
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        if(mIsRemoved) {
-            return;
-        }
         mSurface = new Surface(surface);
         surfaceAvailable(mSurface, width, height);
     }
 
     @Override
     public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
-        if(mIsRemoved) {
-            return;
-        }
         surfaceSizeChanged(width, height);
     }
 
     @Override
     public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-        if(mIsRemoved) {
-            return true;
-        }
         surfaceDestroyed();
-        mSurface.release();
-        mSurface = null;
-        return true;
+        // https://developer.android.com/reference/android/view/TextureView.SurfaceTextureListener#onSurfaceTextureDestroyed(android.graphics.SurfaceTexture)
+        // Invoked when the specified SurfaceTexture is about to be destroyed. If returns true,
+        // no rendering should happen inside the surface texture after this method is invoked.
+        // If returns false, the client needs to call SurfaceTexture#release().
+        return false;
     }
 
     @Override

package/cpp/api/JsiSkApi.h

@@ -39,6 +39,7 @@
 #include "JsiSkContourMeasureIter.h"
 #include "JsiSkPictureRecorder.h"
 #include "JsiSkPictureFactory.h"
+#include "JsiSkColor.h"
 
 namespace RNSkia
 {
@@ -67,6 +68,7 @@ namespace RNSkia
       installFunction("ContourMeasureIter", JsiSkContourMeasureIter::createCtor(context));
       installFunction("MakeVertices", JsiSkVertices::createCtor(context));
       installFunction("PictureRecorder", JsiSkPictureRecorder::createCtor(context));
+      installFunction("parseColorString", JsiSkColor::createCtor());
 
       // Static members
       installReadonlyProperty("FontMgr",

package/cpp/api/JsiSkColor.h

@@ -0,0 +1,49 @@
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include <jsi/jsi.h>
+
+#include "JsiSkHostObjects.h"
+#include "third_party/CSSColorParser.h"
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include <SkColor.h>
+
+#pragma clang diagnostic pop
+
+namespace RNSkia {
+
+    using namespace facebook;
+
+    class JsiSkColor : public JsiHostObject {
+    public:
+
+        JsiSkColor(): JsiHostObject() {}
+
+        ~JsiSkColor() {}
+
+        /**
+         * Creates the function for construction a new instance of the SkColor
+         * wrapper
+         * @return A function for creating a new host object wrapper for the SkColor
+         * class
+         */
+        static const jsi::HostFunctionType
+        createCtor() {
+            return JSI_HOST_FUNCTION_LAMBDA {
+                auto text = arguments[0].asString(runtime).utf8(runtime);
+                auto color = CSSColorParser::parse(text);
+                if (color.a == -1.0f) {
+                    return jsi::Value::undefined();
+                }
+                int a = round(color.a * 255);
+                // Because JS numbers are unsigned we need to do this conversion
+                return jsi::Value(static_cast<double>(SkColorSetARGB(a, color.r, color.g, color.b) >> 0));
+            };
+        }
+    };
+} // namespace RNSkia

package/cpp/api/JsiSkPath.h

@@ -29,9 +29,9 @@ namespace RNSkia {
 
 using namespace facebook;
 
+
 class JsiSkPath : public JsiSkWrappingSharedPtrHostObject<SkPath> {
 public:
-
     // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
     JSI_PROPERTY_GET(__typename__) {
       return jsi::String::createFromUtf8(runtime, "Path");
@@ -484,6 +484,33 @@ public:
             runtime, std::make_shared<JsiSkPath>(getContext(), std::move(result)));
   }
 
+  JSI_HOST_FUNCTION(toCmds) {
+    auto path = *getObject();
+    auto cmds = jsi::Array(runtime, path.countVerbs());
+    auto it = SkPath::Iter(path, false);
+    //                       { "Move", "Line", "Quad", "Conic", "Cubic", "Close", "Done" };
+    const int pointCount[] = {     1 ,     2 ,     3 ,      3 ,      4 ,      1 ,     0  };
+    const int cmdCount[] =   {     3 ,     5 ,     7 ,      8 ,      9 ,      3 ,     0  };
+    SkPoint points[4];
+    SkPath::Verb verb;
+    auto k = 0;
+    while (SkPath::kDone_Verb != (verb = it.next(points))) {
+      auto verbVal = static_cast<int>(verb);
+      auto cmd = jsi::Array(runtime, cmdCount[verbVal]);
+      auto j = 0;
+      cmd.setValueAtIndex(runtime, j++, jsi::Value(verbVal));
+      for (int i = 0; i < pointCount[verbVal]; ++i) {
+        cmd.setValueAtIndex(runtime, j++, jsi::Value(static_cast<double>(points[i].fX)));
+        cmd.setValueAtIndex(runtime, j++, jsi::Value(static_cast<double>(points[i].fY)));
+      }
+      if (SkPath::kConic_Verb == verb) {
+        cmd.setValueAtIndex(runtime, j, jsi::Value(static_cast<double>(it.conicWeight())));
+      }
+      cmds.setValueAtIndex(runtime, k++, cmd);
+    }
+    return cmds;
+  }
+
   JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPath, __typename__))
 
   JSI_EXPORT_FUNCTIONS(
@@ -518,7 +545,9 @@ public:
     JSI_EXPORT_FUNC(JsiSkPath, simplify),
     JSI_EXPORT_FUNC(JsiSkPath, countPoints), JSI_EXPORT_FUNC(JsiSkPath, copy),
     JSI_EXPORT_FUNC(JsiSkPath, fromText), JSI_EXPORT_FUNC(JsiSkPath, op),
-    JSI_EXPORT_FUNC(JsiSkPath, isInterpolatable), JSI_EXPORT_FUNC(JsiSkPath, interpolate)
+    JSI_EXPORT_FUNC(JsiSkPath, isInterpolatable),
+    JSI_EXPORT_FUNC(JsiSkPath, interpolate),
+    JSI_EXPORT_FUNC(JsiSkPath, toCmds),
   )
 
   JsiSkPath(std::shared_ptr<RNSkPlatformContext> context, SkPath path)

package/cpp/api/JsiSkPathFactory.h

@@ -13,6 +13,7 @@
 
 #include <SkPath.h>
 #include <SkPathOps.h>
+#include <RNSkLog.h>
 
 #pragma clang diagnostic pop
 
@@ -21,6 +22,14 @@ namespace RNSkia {
 using namespace facebook;
 
 class JsiSkPathFactory : public JsiSkHostObject {
+
+  static const int MOVE = 0;
+  static const int LINE = 1;
+  static const int QUAD = 2;
+  static const int CONIC = 3;
+  static const int CUBIC = 4;
+  static const int CLOSE = 5;
+
 public:
   JSI_HOST_FUNCTION(Make) {
     return jsi::Object::createFromHostObject(
@@ -53,9 +62,95 @@ public:
         runtime, std::make_shared<JsiSkPath>(getContext(), std::move(result)));
   }
 
+  JSI_HOST_FUNCTION(MakeFromCmds) {
+    SkPath path;
+    auto cmds = arguments[0].asObject(runtime).asArray(runtime);
+    auto cmdCount = cmds.size(runtime);
+    for (int i = 0; i < cmdCount; i++) {
+      auto cmd = cmds.getValueAtIndex(runtime, i).asObject(runtime).asArray(runtime);
+      if (cmd.size(runtime) < 1) {
+        RNSkLogger::logToConsole("Invalid command found (got an empty array)");
+        return jsi::Value::null();
+      }
+      auto verb = static_cast<int>(cmd.getValueAtIndex(runtime, 0).asNumber());
+      switch (verb) {
+        case MOVE: {
+          if (cmd.size(runtime) < 3) {
+            RNSkLogger::logToConsole( "Invalid move command found");
+            return jsi::Value::null();
+          }
+          auto x = cmd.getValueAtIndex(runtime, 1).asNumber();
+          auto y = cmd.getValueAtIndex(runtime, 2).asNumber();
+          path.moveTo(x, y);
+          break;
+        }
+        case LINE: {
+          if (cmd.size(runtime) < 3) {
+            RNSkLogger::logToConsole("Invalid line command found");
+            return jsi::Value::null();
+          }
+          auto x = cmd.getValueAtIndex(runtime, 1).asNumber();
+          auto y = cmd.getValueAtIndex(runtime, 2).asNumber();
+          path.lineTo(x, y);
+          break;
+        }
+        case QUAD: {
+          if (cmd.size(runtime) < 5) {
+            RNSkLogger::logToConsole("Invalid line command found");
+            return jsi::Value::null();
+          }
+          auto x1 = cmd.getValueAtIndex(runtime, 1).asNumber();
+          auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
+          auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
+          auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
+          path.quadTo(x1, y1, x2, y2);
+          break;
+        }
+        case CONIC: {
+          if (cmd.size(runtime) < 6) {
+            RNSkLogger::logToConsole("Invalid line command found");
+            return jsi::Value::null();
+          }
+          auto x1 = cmd.getValueAtIndex(runtime, 1).asNumber();
+          auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
+          auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
+          auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
+          auto w = cmd.getValueAtIndex(runtime, 5).asNumber();
+          path.conicTo(x1, y1, x2, y2, w);
+          break;
+        }
+        case CUBIC: {
+          if (cmd.size(runtime) < 7) {
+            RNSkLogger::logToConsole("Invalid line command found");
+            return jsi::Value::null();
+          }
+          auto x1 = cmd.getValueAtIndex(runtime, 1).asNumber();
+          auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
+          auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
+          auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
+          auto x3 = cmd.getValueAtIndex(runtime, 5).asNumber();
+          auto y3 = cmd.getValueAtIndex(runtime, 6).asNumber();
+          path.cubicTo(x1, y1, x2, y2, x3, y3);
+          break;
+        }
+        case CLOSE: {
+          path.close();
+          break;
+        }
+        default: {
+          RNSkLogger::logToConsole("Found an unknown command");
+          return jsi::Value::null();
+        }
+      }
+    }
+    return jsi::Object::createFromHostObject(
+            runtime, std::make_shared<JsiSkPath>(getContext(), std::move(path)));
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPathFactory, Make),
                        JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromSVGString),
-                       JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromOp))
+                       JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromOp),
+                       JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromCmds))
 
   JsiSkPathFactory(std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkHostObject(std::move(context)) {}