@shopify/react-native-skia 0.1.151 → 0.1.152

package/android/cpp/rnskia-android/SkiaOpenGLRenderer.cpp

@@ -1,6 +1,8 @@
 #include "SkiaOpenGLRenderer.h"
 
 #include <RNSkLog.h>
+#include <android/native_window.h>
+#include <android/native_window_jni.h>
 
 namespace RNSkia
 {
@@ -20,9 +22,14 @@ namespace RNSkia
         return threadContexts.at(threadId);
     }
 
-    SkiaOpenGLRenderer::SkiaOpenGLRenderer(ANativeWindow *surface, size_t renderId) : _surfaceTexture(surface),
-                                                                                      _renderId(renderId)
-    {
+    SkiaOpenGLRenderer::SkiaOpenGLRenderer(jobject surface) {
+      _nativeWindow = ANativeWindow_fromSurface(facebook::jni::Environment::current(), surface);
+    }
+
+    SkiaOpenGLRenderer::~SkiaOpenGLRenderer() {
+      // Release surface
+      ANativeWindow_release(_nativeWindow);
+      _nativeWindow = nullptr;
     }
 
     void SkiaOpenGLRenderer::run(const std::function<void(SkCanvas *)> &cb, int width, int height)
@@ -79,13 +86,15 @@ namespace RNSkia
         {
             _renderState = RenderState::Done;
 
+            // Release GL surface
             if (_glSurface != EGL_NO_SURFACE && getThreadDrawingContext()->glDisplay != EGL_NO_DISPLAY)
             {
                 eglDestroySurface(getThreadDrawingContext()->glDisplay, _glSurface);
+              _glSurface = EGL_NO_SURFACE;
             }
 
+            // Release Skia Surface
             _skSurface = nullptr;
-            _surfaceTexture = nullptr;
 
             break;
         }
@@ -215,7 +224,7 @@ namespace RNSkia
 
     bool SkiaOpenGLRenderer::initGLSurface()
     {
-        if (_surfaceTexture == nullptr)
+        if (_nativeWindow == nullptr)
         {
             return false;
         }
@@ -240,7 +249,7 @@ namespace RNSkia
             eglCreateWindowSurface(
                 getThreadDrawingContext()->glDisplay,
                 getThreadDrawingContext()->glConfig,
-                _surfaceTexture,
+                _nativeWindow,
                 nullptr);
 
         if (_glSurface == EGL_NO_SURFACE)

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

@@ -3,6 +3,8 @@
 #include <RNSkLog.h>
 
 #include "android/native_window.h"
+#include <fbjni/fbjni.h>
+#include <jni.h>
 #include "EGL/egl.h"
 #include "GLES2/gl2.h"
 
@@ -45,7 +47,8 @@ namespace RNSkia
     class SkiaOpenGLRenderer
     {
     public:
-        SkiaOpenGLRenderer(ANativeWindow *surface, size_t renderId);
+        SkiaOpenGLRenderer(jobject surface);
+        ~SkiaOpenGLRenderer();
 
         /**
          * Initializes, renders and tears down the render pipeline depending on the state of the
@@ -116,15 +119,13 @@ namespace RNSkia
 
         EGLSurface _glSurface = EGL_NO_SURFACE;
 
-        ANativeWindow *_surfaceTexture = nullptr;
+        ANativeWindow *_nativeWindow = nullptr;
         GrBackendRenderTarget _skRenderTarget;
         sk_sp<SkSurface> _skSurface;
 
         int _prevWidth = 0;
         int _prevHeight = 0;
 
-        size_t _renderId;
-
         std::atomic<RenderState> _renderState = { RenderState::Initializing };
     };
 

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

@@ -26,8 +26,8 @@ import java.util.concurrent.Executors;
 public class PlatformContext {
     @DoNotStrip
     private final HybridData mHybridData;
+
     private final ReactContext mContext;
-    private ExecutorService mDrawCallbackThread = Executors.newSingleThreadExecutor();
 
     private boolean _drawLoopActive = false;
     private boolean _isPaused = false;
@@ -37,7 +37,6 @@ public class PlatformContext {
     public PlatformContext(ReactContext reactContext) {
         mContext = reactContext;
         mHybridData = initHybrid(reactContext.getResources().getDisplayMetrics().density);
-
     }
 
     private byte[] getStreamAsBytes(InputStream is) throws IOException {
@@ -66,6 +65,7 @@ public class PlatformContext {
         Choreographer.getInstance().postFrameCallback(frameCallback);
     }
 
+    @DoNotStrip
     public void raise(final String message) {
         new Handler(Looper.getMainLooper()).post(new Runnable() {
             @Override
@@ -75,6 +75,7 @@ public class PlatformContext {
         });
     }
 
+    @DoNotStrip
     public void beginDrawLoop() {
         if (_drawLoopActive) {
             return;
@@ -88,21 +89,14 @@ public class PlatformContext {
         });
     }
 
+    @DoNotStrip
     public void endDrawLoop() {
         if (_drawLoopActive) {
             _drawLoopActive = false;
         }
     }
 
-    public void triggerOnRenderThread() {
-        mDrawCallbackThread.execute(new Runnable() {
-            @Override
-            public void run() {
-                notifyTaskReady();
-            }
-        });
-    }
-
+    @DoNotStrip
     public byte[] getJniStreamFromSource(String sourceUri) throws IOException {
         // First try loading the input as a resource directly
         int resourceId = mContext.getResources().getIdentifier(sourceUri, "drawable", mContext.getPackageName());

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

@@ -3,7 +3,6 @@
 package com.shopify.reactnative.skia;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import com.facebook.react.ReactPackage;
@@ -19,6 +18,6 @@ public class RNSkiaPackage implements ReactPackage {
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Arrays.<ViewManager>asList(new RNSkiaViewManager());
+        return Arrays.<ViewManager>asList(new SkiaDrawViewManager(), new SkiaPictureViewManager());
     }
 }

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

@@ -0,0 +1,143 @@
+package com.shopify.reactnative.skia;
+
+import android.content.Context;
+import android.graphics.SurfaceTexture;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.TextureView;
+
+import com.facebook.jni.annotations.DoNotStrip;
+
+public abstract class SkiaBaseView extends TextureView implements TextureView.SurfaceTextureListener {
+
+    @DoNotStrip
+    private Surface mSurface;
+
+    public SkiaBaseView(Context context) {
+        super(context);
+        setSurfaceTextureListener(this);
+        setOpaque(false);
+    }
+
+    @Override
+    public void setBackgroundColor(int color) {
+        // Texture view does not support setting the background color.
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        // https://developer.android.com/training/gestures/multi
+        int action = ev.getActionMasked();
+
+        MotionEvent.PointerCoords r = new MotionEvent.PointerCoords();
+
+        double[] points;
+
+        // If this is a pointer_up/down event we need to handle it a bit specialized
+        switch (action) {
+            case MotionEvent.ACTION_POINTER_DOWN:
+            case MotionEvent.ACTION_POINTER_UP: {
+                points = new double[5];
+                int pointerIndex = ev.getActionIndex();
+                ev.getPointerCoords(pointerIndex, r);
+                points[0] = r.x;
+                points[1] = r.y;
+                points[2] = ev.getPressure(pointerIndex);
+                points[3] = motionActionToType(action);
+                points[4] = ev.getPointerId(pointerIndex);
+
+                updateTouchPoints(points);
+
+                break;
+            }
+            default: {
+                // For the rest we can just handle it like expected
+                int count = ev.getPointerCount();
+                int pointerIndex = 0;
+                points = new double[5 * count];
+                for (int i = 0; i < count; i++) {
+                    ev.getPointerCoords(i, r);
+                    points[pointerIndex++] = r.x;
+                    points[pointerIndex++] = r.y;
+                    points[pointerIndex++] = ev.getPressure(i);
+                    points[pointerIndex++] = motionActionToType(action);
+                    points[pointerIndex++] = ev.getPointerId(i);
+                }
+
+                updateTouchPoints(points);
+
+                break;
+            }
+        }
+
+        return true;
+    }
+
+    private static int motionActionToType(int action) {
+        int actionType = 3;
+        switch (action) {
+            case MotionEvent.ACTION_DOWN:
+            case MotionEvent.ACTION_POINTER_DOWN:
+                actionType = 0;
+                break;
+            case MotionEvent.ACTION_MOVE:
+                actionType = 1;
+                break;
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_POINTER_UP:
+                actionType = 2;
+                break;
+            case MotionEvent.ACTION_CANCEL:
+                actionType = 3;
+                break;
+        }
+        return actionType;
+    }
+
+    @Override
+    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+        mSurface = new Surface(surface);
+        surfaceAvailable(mSurface, width, height);
+    }
+
+    @Override
+    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+        surfaceSizeChanged(width, height);
+    }
+
+    @Override
+    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+        // Notify the native side
+        surfaceDestroyed();
+        // 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.
+        // We've measured this and it seems like we need to call release and return true - and
+        // then handle the issue with this being ripped out underneath the native layer in the C++
+        // code.
+        mSurface.release();
+        // Return true - we promise that no more rendering will be done now.
+        return true;
+    }
+
+    @Override
+    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+        // Nothing special to do here
+    }
+
+    protected abstract void surfaceAvailable(Object surface, int width, int height);
+
+    protected abstract void surfaceSizeChanged(int width, int height);
+
+    protected abstract void surfaceDestroyed();
+
+    protected abstract void setMode(String mode);
+
+    protected abstract void setDebugMode(boolean show);
+
+    protected abstract void updateTouchPoints(double[] points);
+
+    protected abstract void registerView(int nativeId);
+
+    protected abstract void unregisterView();
+}

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

@@ -1,173 +1,45 @@
 package com.shopify.reactnative.skia;
 
 import android.content.Context;
-import android.graphics.SurfaceTexture;
-import android.view.Surface;
-import android.view.TextureView;
-import android.view.MotionEvent;
 
 import com.facebook.jni.HybridData;
 import com.facebook.jni.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactContext;
 
-public class SkiaDrawView extends TextureView implements TextureView.SurfaceTextureListener {
-
-    private static final String TAG = "Java::JniSkiaDrawView";
-
+public class SkiaDrawView extends SkiaBaseView {
     @DoNotStrip
     private HybridData mHybridData;
 
-    @DoNotStrip
-    private boolean mViewRemoved;
-
-    @DoNotStrip
-    private Surface mSurface;
-
-    public SkiaDrawView(Context ctx) {
-        super(ctx);
-        RNSkiaModule skiaModule = ((ReactContext)ctx).getNativeModule(RNSkiaModule.class);
+    public SkiaDrawView(Context context) {
+        super(context);
+        RNSkiaModule skiaModule = ((ReactContext) context).getNativeModule(RNSkiaModule.class);
         mHybridData = initHybrid(skiaModule.getSkiaManager());
-        setSurfaceTextureListener(this);
-        setOpaque(false);
-    }
-
-    @Override
-    public void setBackgroundColor(int color) {
-        // Texture view does not support setting the background color.
-    }
-
-    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();
-        }
-    }
-
-    void onViewRemoved() {
-        mViewRemoved = true;
-        // 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(mSurface == null) {
-            mHybridData.resetNative();
-        }
     }
 
     @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        // https://developer.android.com/training/gestures/multi
-        int action = ev.getActionMasked();
-
-        MotionEvent.PointerCoords r = new MotionEvent.PointerCoords();
-
-        double[] points;
-
-        // If this is a pointer_up/down event we need to handle it a bit specialized
-        switch (action) {
-            case MotionEvent.ACTION_POINTER_DOWN:
-            case MotionEvent.ACTION_POINTER_UP: {
-                points = new double[5];
-                int pointerIndex = ev.getActionIndex();
-                ev.getPointerCoords(pointerIndex, r);
-                points[0] = r.x;
-                points[1] = r.y;
-                points[2] = ev.getPressure(pointerIndex);
-                points[3] = motionActionToType(action);
-                points[4] = ev.getPointerId(pointerIndex);
-
-                updateTouchPoints(points);
-
-                break;
-            }
-            default: {
-                // For the rest we can just handle it like expected
-                int count = ev.getPointerCount();
-                int pointerIndex = 0;
-                points = new double[5 * count];
-                for (int i = 0; i < count; i++) {
-                    ev.getPointerCoords(i, r);
-                    points[pointerIndex++] = r.x;
-                    points[pointerIndex++] = r.y;
-                    points[pointerIndex++] = ev.getPressure(i);
-                    points[pointerIndex++] = motionActionToType(action);
-                    points[pointerIndex++] = ev.getPointerId(i);
-                }
-
-                updateTouchPoints(points);
-
-                break;
-            }
-        }
-
-        return true;
+    protected void finalize() throws Throwable {
+        super.finalize();
+        mHybridData.resetNative();
     }
 
-    private static int motionActionToType(int action) {
-        int actionType = 3;
-        switch (action) {
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_POINTER_DOWN:
-                actionType = 0;
-                break;
-            case MotionEvent.ACTION_MOVE:
-                actionType = 1;
-                break;
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_POINTER_UP:
-                actionType = 2;
-                break;
-            case MotionEvent.ACTION_CANCEL:
-                actionType = 3;
-                break;
-        }
-        return actionType;
-    }
-
-    @Override
-    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        mSurface = new Surface(surface);
-        surfaceAvailable(mSurface, width, height);
-    }
-
-    @Override
-    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
-        surfaceSizeChanged(width, height);
-    }
+    private native HybridData initHybrid(SkiaManager skiaManager);
 
-    @Override
-    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-        surfaceDestroyed();
-        // 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.
-        // When returning false, the client needs to call SurfaceTexture#release().
-        return false;
-    }
+    protected native void surfaceAvailable(Object surface, int width, int height);
 
-    @Override
-    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
-        // Nothing special to do here
-    }
+    protected native void surfaceSizeChanged(int width, int height);
 
-    private native HybridData initHybrid(SkiaManager skiaManager);
+    protected native void surfaceDestroyed();
 
-    private native void surfaceAvailable(Object surface, int width, int height);
+    protected native void setBgColor(int color);
 
-    private native void surfaceSizeChanged(int width, int height);
+    protected native void setMode(String mode);
 
-    private native void surfaceDestroyed();
+    protected native void setDebugMode(boolean show);
 
-    private native void setBgColor(int color);
+    protected native void updateTouchPoints(double[] points);
 
-    public native void setMode(String mode);
+    protected native void registerView(int nativeId);
 
-    public native void setDebugMode(boolean show);
+    protected native void unregisterView();
 
-    public native void updateTouchPoints(double[] points);
 }

package/android/src/main/java/com/shopify/reactnative/skia/{RNSkiaViewManager.java → SkiaDrawViewManager.java}

@@ -1,6 +1,5 @@
 package com.shopify.reactnative.skia;
 
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -9,16 +8,12 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import java.util.HashMap;
-
-public class RNSkiaViewManager extends BaseViewManager<SkiaDrawView, LayoutShadowNode> {
-
-    final private HashMap<SkiaDrawView, Integer> mViewMapping = new HashMap();
+public class SkiaDrawViewManager extends BaseViewManager<SkiaDrawView, LayoutShadowNode> {
 
     @NonNull
     @Override
     public String getName() {
-        return "ReactNativeSkiaView";
+        return "SkiaDrawView";
     }
 
     @Override
@@ -39,9 +34,7 @@ public class RNSkiaViewManager extends BaseViewManager<SkiaDrawView, LayoutShado
     public void setNativeId(@NonNull SkiaDrawView view, @Nullable String nativeId) {
         super.setNativeId(view, nativeId);
         int nativeIdResolved = Integer.parseInt(nativeId);
-        RNSkiaModule skiaModule = ((ReactContext)view.getContext()).getNativeModule(RNSkiaModule.class);
-        skiaModule.getSkiaManager().register(nativeIdResolved, view);
-        mViewMapping.put(view, nativeIdResolved);
+        view.registerView(nativeIdResolved);
     }
 
     @ReactProp(name = "mode")
@@ -57,11 +50,7 @@ public class RNSkiaViewManager extends BaseViewManager<SkiaDrawView, LayoutShado
     @Override
     public void onDropViewInstance(@NonNull SkiaDrawView view) {
         super.onDropViewInstance(view);
-        RNSkiaModule skiaModule = ((ReactContext)view.getContext()).getNativeModule(RNSkiaModule.class);
-        Integer nativeId = mViewMapping.get(view);
-        skiaModule.getSkiaManager().unregister(nativeId);
-        mViewMapping.remove(view);
-        view.onViewRemoved();
+        view.unregisterView();
     }
 
     @NonNull

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

@@ -43,14 +43,6 @@ public class SkiaManager {
         return mPlatformContext;
     }
 
-    public void register(int nativeId, SkiaDrawView view) {
-        registerSkiaView(nativeId, view);
-    }
-
-    public void unregister(int nativeId) {
-        unregisterSkiaView(nativeId);
-    }
-
     public void onHostResume() { mPlatformContext.onResume(); }
 
     public void onHostPause() {  mPlatformContext.onPause(); }
@@ -58,9 +50,8 @@ public class SkiaManager {
     // private C++ functions
     private native HybridData initHybrid(long jsContext, CallInvokerHolderImpl jsCallInvokerHolder,
             PlatformContext platformContext);
+
     private native void initializeRuntime();
-    private native void registerSkiaView(int nativeId, SkiaDrawView view);
-    private native void unregisterSkiaView(int nativeId);
     public native void invalidate();
 
 }

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

@@ -0,0 +1,45 @@
+package com.shopify.reactnative.skia;
+
+import android.content.Context;
+
+import com.facebook.jni.HybridData;
+import com.facebook.jni.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReactContext;
+
+public class SkiaPictureView extends SkiaBaseView {
+    @DoNotStrip
+    private HybridData mHybridData;
+
+    public SkiaPictureView(Context context) {
+        super(context);
+        RNSkiaModule skiaModule = ((ReactContext) context).getNativeModule(RNSkiaModule.class);
+        mHybridData = initHybrid(skiaModule.getSkiaManager());
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        super.finalize();
+        mHybridData.resetNative();
+    }
+
+    private native HybridData initHybrid(SkiaManager skiaManager);
+
+    protected native void surfaceAvailable(Object surface, int width, int height);
+
+    protected native void surfaceSizeChanged(int width, int height);
+
+    protected native void surfaceDestroyed();
+
+    protected native void setBgColor(int color);
+
+    protected native void setMode(String mode);
+
+    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/SkiaPictureViewManager.java

@@ -0,0 +1,64 @@
+package com.shopify.reactnative.skia;
+
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.LayoutShadowNode;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.annotations.ReactProp;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.HashMap;
+
+public class SkiaPictureViewManager extends BaseViewManager<SkiaPictureView, LayoutShadowNode> {
+
+    @NonNull
+    @Override
+    public String getName() {
+        return "SkiaPictureView";
+    }
+
+    @Override
+    public LayoutShadowNode createShadowNodeInstance() {
+        return new LayoutShadowNode();
+    }
+
+    @Override
+    public Class<? extends LayoutShadowNode> getShadowNodeClass() {
+        return LayoutShadowNode.class;
+    }
+
+    @Override
+    public void updateExtraData(SkiaPictureView root, Object extraData) {
+    }
+
+    @Override
+    public void setNativeId(@NonNull SkiaPictureView view, @Nullable String nativeId) {
+        super.setNativeId(view, nativeId);
+        int nativeIdResolved = Integer.parseInt(nativeId);
+        view.registerView(nativeIdResolved);
+    }
+
+    @ReactProp(name = "mode")
+    public void setMode(SkiaPictureView view, String mode) {
+        view.setMode(mode);
+    }
+
+    @ReactProp(name = "debug")
+    public void setDebug(SkiaPictureView view, boolean show) {
+        view.setDebugMode(show);
+    }
+
+    @Override
+    public void onDropViewInstance(@NonNull SkiaPictureView view) {
+        super.onDropViewInstance(view);
+        view.unregisterView();
+    }
+
+    @NonNull
+    @Override
+    protected SkiaPictureView createViewInstance(@NonNull ThemedReactContext reactContext) {
+        return new SkiaPictureView(reactContext);
+    }
+}