@shopify/react-native-skia 1.5.8 → 1.5.9

package/android/CMakeLists.txt

@@ -87,7 +87,6 @@ add_library(
 
         "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkManager.cpp"
         "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkDomView.cpp"
-        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkDispatchQueue.cpp"
 
         "${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/base/DrawingContext.cpp"
         "${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/base/ConcatablePaint.cpp"

package/android/cpp/jni/JniPlatformContext.cpp

@@ -63,10 +63,6 @@ using TSelf = jni::local_ref<JniPlatformContext::jhybriddata>;
 void JniPlatformContext::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", JniPlatformContext::initHybrid),
-      makeNativeMethod("notifyDrawLoop",
-                       JniPlatformContext::notifyDrawLoopExternal),
-      makeNativeMethod("notifyTaskReady",
-                       JniPlatformContext::notifyTaskReadyExternal),
   });
 }
 
@@ -134,51 +130,6 @@ sk_sp<SkImage> JniPlatformContext::takeScreenshotFromViewTag(size_t tag) {
   return skImage;
 }
 
-void JniPlatformContext::startDrawLoop() {
-  jni::ThreadScope ts;
-  // Start drawing loop
-  static auto method =
-      javaPart_->getClass()->getMethod<void(void)>("beginDrawLoop");
-  method(javaPart_.get());
-}
-
-void JniPlatformContext::stopDrawLoop() {
-  jni::ThreadScope ts;
-  // Stop drawing loop
-  static auto method =
-      javaPart_->getClass()->getMethod<void(void)>("endDrawLoop");
-  method(javaPart_.get());
-}
-
-void JniPlatformContext::notifyDrawLoopExternal() {
-  jni::ThreadScope ts;
-  _onNotifyDrawLoop();
-}
-
-void JniPlatformContext::runTaskOnMainThread(std::function<void()> task) {
-  _taskMutex->lock();
-  _taskCallbacks.push(task);
-  _taskMutex->unlock();
-
-  // Notify Java that task is ready
-  static auto method = javaPart_->getClass()->getMethod<void(void)>(
-      "notifyTaskReadyOnMainThread");
-  method(javaPart_.get());
-}
-
-void JniPlatformContext::notifyTaskReadyExternal() {
-  jni::ThreadScope ts;
-  _taskMutex->lock();
-  auto task = _taskCallbacks.front();
-  if (task != nullptr) {
-    _taskCallbacks.pop();
-    _taskMutex->unlock();
-    task();
-  } else {
-    _taskMutex->unlock();
-  }
-}
-
 void JniPlatformContext::performStreamOperation(
     const std::string &sourceUri,
     const std::function<void(std::unique_ptr<SkStreamAsset>)> &op) {

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

@@ -33,11 +33,6 @@ public:
 
   void raiseError(const std::exception &err);
 
-  void startDrawLoop();
-  void stopDrawLoop();
-
-  void notifyDrawLoopExternal();
-
   void notifyTaskReadyExternal();
 
   void runTaskOnMainThread(std::function<void()> task);
@@ -46,10 +41,6 @@ public:
 
   sk_sp<SkImage> takeScreenshotFromViewTag(size_t tag);
 
-  void setOnNotifyDrawLoop(const std::function<void(void)> &callback) {
-    _onNotifyDrawLoop = callback;
-  }
-
   jni::global_ref<jobject> createVideo(const std::string &url);
 
 private:
@@ -58,16 +49,9 @@ private:
 
   float _pixelDensity;
 
-  std::function<void(void)> _onNotifyDrawLoop;
-
-  std::queue<std::function<void()>> _taskCallbacks;
-
-  std::shared_ptr<std::mutex> _taskMutex;
-
   explicit JniPlatformContext(
       jni::alias_ref<JniPlatformContext::jhybridobject> jThis,
       const float pixelDensity)
-      : _taskMutex(std::make_shared<std::mutex>()),
-        javaPart_(jni::make_global(jThis)), _pixelDensity(pixelDensity) {}
+      : javaPart_(jni::make_global(jThis)), _pixelDensity(pixelDensity) {}
 };
 } // namespace RNSkia

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

@@ -39,8 +39,6 @@ protected:
 
   virtual void surfaceDestroyed() { _skiaAndroidView->surfaceDestroyed(); }
 
-  virtual void setMode(std::string mode) { _skiaAndroidView->setMode(mode); }
-
   virtual void setDebugMode(bool show) {
     _skiaAndroidView->setShowDebugInfo(show);
   }

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

@@ -40,7 +40,6 @@ public:
          makeNativeMethod("surfaceDestroyed", JniSkiaDomView::surfaceDestroyed),
          makeNativeMethod("surfaceSizeChanged",
                           JniSkiaDomView::surfaceSizeChanged),
-         makeNativeMethod("setMode", JniSkiaDomView::setMode),
          makeNativeMethod("setDebugMode", JniSkiaDomView::setDebugMode),
          makeNativeMethod("registerView", JniSkiaDomView::registerView),
          makeNativeMethod("unregisterView", JniSkiaDomView::unregisterView)});
@@ -57,8 +56,6 @@ protected:
 
   void surfaceDestroyed() override { JniSkiaBaseView::surfaceDestroyed(); }
 
-  void setMode(std::string mode) override { JniSkiaBaseView::setMode(mode); }
-
   void setDebugMode(bool show) override { JniSkiaBaseView::setDebugMode(show); }
 
   void registerView(int nativeId) override {

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

@@ -53,8 +53,6 @@ public:
   std::shared_ptr<RNSkManager> getSkiaManager() { return _skManager; }
 
   void invalidate() {
-    _context->stopDrawLoop();
-    _context->notifyDrawLoop(true);
     _skManager = nullptr;
     _context = nullptr;
   }

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

@@ -41,7 +41,6 @@ public:
                           JniSkiaPictureView::surfaceDestroyed),
          makeNativeMethod("surfaceSizeChanged",
                           JniSkiaPictureView::surfaceSizeChanged),
-         makeNativeMethod("setMode", JniSkiaPictureView::setMode),
          makeNativeMethod("setDebugMode", JniSkiaPictureView::setDebugMode),
          makeNativeMethod("registerView", JniSkiaPictureView::registerView),
          makeNativeMethod("unregisterView",
@@ -59,8 +58,6 @@ protected:
 
   void surfaceDestroyed() override { JniSkiaBaseView::surfaceDestroyed(); }
 
-  void setMode(std::string mode) override { JniSkiaBaseView::setMode(mode); }
-
   void setDebugMode(bool show) override { JniSkiaBaseView::setDebugMode(show); }
 
   void registerView(int nativeId) override {

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

@@ -0,0 +1,69 @@
+#pragma once
+
+#include <android/looper.h>
+#include <unistd.h>
+
+class MainThreadDispatcher {
+private:
+  ALooper *mainLooper;
+  int messagePipe[2];
+  std::queue<std::function<void()>> taskQueue;
+  std::mutex queueMutex;
+
+  static constexpr int LOOPER_ID_MAIN = 1;
+
+  void processMessages() {
+    std::lock_guard<std::mutex> lock(queueMutex);
+    while (!taskQueue.empty()) {
+      auto task = taskQueue.front();
+      taskQueue.pop();
+      task();
+    }
+  }
+
+public:
+  static MainThreadDispatcher &getInstance() {
+    static MainThreadDispatcher instance;
+    return instance;
+  }
+
+  void post(std::function<void()> task) {
+    // TODO: this is disabled for now but we can clean this up
+    // if (ALooper_forThread() == mainLooper) {
+    //     task();
+    // } else {
+    {
+      std::lock_guard<std::mutex> lock(queueMutex);
+      taskQueue.push(std::move(task));
+    }
+    char wake = 1;
+    write(messagePipe[1], &wake, 1);
+    // }
+  }
+
+  ~MainThreadDispatcher() {
+    close(messagePipe[0]);
+    close(messagePipe[1]);
+  }
+
+private:
+  MainThreadDispatcher() {
+    mainLooper = ALooper_forThread();
+    if (!mainLooper) {
+      mainLooper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS);
+    }
+
+    pipe(messagePipe);
+
+    ALooper_addFd(
+        mainLooper, messagePipe[0], LOOPER_ID_MAIN, ALOOPER_EVENT_INPUT,
+        [](int fd, int events, void *data) -> int {
+          char buf[1];
+          read(fd, buf, 1);
+          auto dispatcher = static_cast<MainThreadDispatcher *>(data);
+          dispatcher->processMessages();
+          return 1;
+        },
+        this);
+  }
+};

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

@@ -17,6 +17,7 @@
 
 #include "AHardwareBufferUtils.h"
 #include "JniPlatformContext.h"
+#include "MainThreadDispatcher.h"
 #include "RNSkAndroidVideo.h"
 #include "RNSkPlatformContext.h"
 
@@ -37,13 +38,9 @@ public:
       std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker)
       : RNSkPlatformContext(runtime, jsCallInvoker,
                             jniPlatformContext->getPixelDensity()),
-        _jniPlatformContext(jniPlatformContext) {
-    // Hook onto the notify draw loop callback in the platform context
-    jniPlatformContext->setOnNotifyDrawLoop(
-        [this]() { notifyDrawLoop(false); });
-  }
+        _jniPlatformContext(jniPlatformContext) {}
 
-  ~RNSkAndroidPlatformContext() { stopDrawLoop(); }
+  ~RNSkAndroidPlatformContext() {}
 
   void performStreamOperation(
       const std::string &sourceUri,
@@ -163,17 +160,13 @@ public:
   }
 
   void runOnMainThread(std::function<void()> task) override {
-    _jniPlatformContext->runTaskOnMainThread(task);
+    MainThreadDispatcher::getInstance().post(std::move(task));
   }
 
   sk_sp<SkImage> takeScreenshotFromViewTag(size_t tag) override {
     return _jniPlatformContext->takeScreenshotFromViewTag(tag);
   }
 
-  void startDrawLoop() override { _jniPlatformContext->startDrawLoop(); }
-
-  void stopDrawLoop() override { _jniPlatformContext->stopDrawLoop(); }
-
 private:
   JniPlatformContext *_jniPlatformContext;
 };

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

@@ -19,8 +19,6 @@ public:
 
   virtual float getPixelDensity() = 0;
 
-  virtual void setMode(std::string mode) = 0;
-
   virtual void setShowDebugInfo(bool show) = 0;
 
   virtual void viewDidUnmount() = 0;
@@ -42,7 +40,7 @@ public:
 
     // Try to render directly when the surface has been set so that
     // we don't have to wait until the draw loop returns.
-    RNSkView::renderImmediate();
+    RNSkView::redraw();
   }
 
   void surfaceDestroyed() override {
@@ -55,24 +53,16 @@ public:
         ->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();
+    RNSkView::redraw();
   }
 
   float getPixelDensity() override {
     return T::getPlatformContext()->getPixelDensity();
   }
 
-  void setMode(std::string mode) override {
-    if (mode.compare("continuous") == 0) {
-      T::setDrawingMode(RNSkDrawingMode::Continuous);
-    } else {
-      T::setDrawingMode(RNSkDrawingMode::Default);
-    }
-  }
-
   void setShowDebugInfo(bool show) override { T::setShowDebugOverlays(show); }
 
-  void viewDidUnmount() override { T::endDrawingLoop(); }
+  void viewDidUnmount() override {}
 
   std::shared_ptr<RNSkView> getSkiaView() override {
     return T::shared_from_this();

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

@@ -64,7 +64,6 @@ bool RNSkOpenGLCanvasProvider::renderToCanvas(
 
       // Swap buffers and show on screen
       _surfaceHolder->present();
-
       return true;
     } else {
       // the render context did not provide a surface

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

@@ -25,14 +25,8 @@ public class PlatformContext {
 
     private final ReactContext mContext;
 
-    private boolean _drawLoopActive = false;
-    private boolean _isPaused = false;
-
     private final String TAG = "PlatformContext";
 
-    private final Handler mainHandler = new Handler(Looper.getMainLooper());
-
-
     public PlatformContext(ReactContext reactContext) {
         mContext = reactContext;
         mHybridData = initHybrid(reactContext.getResources().getDisplayMetrics().density);
@@ -53,69 +47,11 @@ public class PlatformContext {
         return buffer.toByteArray();
     }
 
-    private void postFrameLoop() {
-        Choreographer.FrameCallback frameCallback = new Choreographer.FrameCallback() {
-            @Override
-            public void doFrame(long frameTimeNanos) {
-                if (_drawLoopActive) {
-                    Choreographer.getInstance().postFrameCallback(this);
-                }
-                if (_isPaused) {
-                    return;
-                }
-                notifyDrawLoop();
-            }
-        };
-        Choreographer.getInstance().postFrameCallback(frameCallback);
-    }
-
-
-    @DoNotStrip
-    public void notifyTaskReadyOnMainThread() {
-        mainHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                notifyTaskReady();
-            }
-        });
-    }
-
     @DoNotStrip
     Object takeScreenshotFromViewTag(int tag) {
         return ViewScreenshotService.makeViewScreenshotFromTag(mContext, tag);
     }
 
-    @DoNotStrip
-    public void raise(final String message) {
-        mainHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                mContext.handleException(new Exception(message));
-            }
-        });
-    }
-
-    @DoNotStrip
-    public void beginDrawLoop() {
-        if (_drawLoopActive) {
-            return;
-        }
-        _drawLoopActive = true;
-        mainHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                postFrameLoop();
-            }
-        });
-    }
-
-    @DoNotStrip
-    public void endDrawLoop() {
-        if (_drawLoopActive) {
-            _drawLoopActive = false;
-        }
-    }
-
     @DoNotStrip
     public byte[] getJniStreamFromSource(String sourceUri) throws IOException {
         // First try loading the input as a resource directly
@@ -163,25 +99,6 @@ public class PlatformContext {
         return null;
     }
 
-    void onPause() {
-        Log.i(TAG, "Paused");
-        _isPaused = true;
-    }
-
-    void onResume() {
-        _isPaused = false;
-        Log.i(TAG, "Resume");
-        if(_drawLoopActive) {
-            // Restart draw loop
-            mainHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    postFrameLoop();
-                }
-            });
-        }
-    }
-
     @Override
     protected void finalize() throws Throwable {
         mHybridData.resetNative();
@@ -190,6 +107,4 @@ public class PlatformContext {
 
     // Private c++ native methods
     private native HybridData initHybrid(float pixelDensity);
-    private native void notifyDrawLoop();
-    private native void notifyTaskReady();
 }

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

@@ -12,7 +12,7 @@ import com.facebook.react.module.annotations.ReactModule;
 import java.lang.ref.WeakReference;
 
 @ReactModule(name="RNSkiaModule")
-public class RNSkiaModule extends NativeSkiaModuleSpec implements LifecycleEventListener {
+public class RNSkiaModule extends NativeSkiaModuleSpec {
     public static final String NAME = "RNSkiaModule";
 
     private final WeakReference<ReactApplicationContext> weakReactContext;
@@ -21,17 +21,12 @@ public class RNSkiaModule extends NativeSkiaModuleSpec implements LifecycleEvent
     public RNSkiaModule(ReactApplicationContext reactContext) {
         super(reactContext);
         this.weakReactContext = new WeakReference<>(reactContext);
-        reactContext.addLifecycleEventListener(this);
     }
 
     @Override
     public void invalidate() {
         super.invalidate();
 
-        if (getReactApplicationContext() != null) {
-            getReactApplicationContext().removeLifecycleEventListener(this);
-        }
-
         if (this.skiaManager != null) {
             this.skiaManager.invalidate();
             this.skiaManager.destroy();
@@ -69,19 +64,4 @@ public class RNSkiaModule extends NativeSkiaModuleSpec implements LifecycleEvent
             return false;
         }
     }
-
-    @Override
-    public void onHostResume() {
-        if(skiaManager != null) skiaManager.onHostResume();
-    }
-
-    @Override
-    public void onHostPause() {
-        if(skiaManager != null) skiaManager.onHostPause();
-    }
-
-    @Override
-    public void onHostDestroy() {
-
-    }
 }

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

@@ -43,10 +43,6 @@ public class SkiaManager {
         return mPlatformContext;
     }
 
-    public void onHostResume() { mPlatformContext.onResume(); }
-
-    public void onHostPause() {  mPlatformContext.onPause(); }
-
     // private C++ functions
     private native HybridData initHybrid(long jsContext, RuntimeExecutor runtimeExecutor,
             PlatformContext platformContext);

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

@@ -21,11 +21,8 @@ public class SkiaDomViewManagerDelegate<T extends View, U extends BaseViewManage
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
-      case "mode":
-        mViewManager.setMode(view, value == null ? null : (String) value);
-        break;
       case "debug":
-        mViewManager.setDebug(view, value == null ? false : (boolean) value);
+        mViewManager.setDebug(view, value != null && (boolean) value);
         break;
       default:
         super.setProperty(view, propName, value);

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

@@ -13,6 +13,5 @@ import android.view.View;
 import androidx.annotation.Nullable;
 
 public interface SkiaDomViewManagerInterface<T extends View> {
-  void setMode(T view, @Nullable String value);
   void setDebug(T view, boolean value);
 }

package/cpp/rnskia/RNSkManager.cpp

@@ -47,13 +47,12 @@ void RNSkManager::invalidate() {
 
   // Invalidate members
   _viewApi->unregisterAll();
-  _platformContext->invalidate();
 }
 
 void RNSkManager::registerSkiaView(size_t nativeId,
                                    std::shared_ptr<RNSkView> view) {
   if (!_isInvalidated && _viewApi != nullptr)
-    _viewApi->registerSkiaView(nativeId, view);
+    _viewApi->registerSkiaView(nativeId, std::move(view));
 }
 
 void RNSkManager::unregisterSkiaView(size_t nativeId) {
@@ -63,7 +62,7 @@ void RNSkManager::unregisterSkiaView(size_t nativeId) {
 
 void RNSkManager::setSkiaView(size_t nativeId, std::shared_ptr<RNSkView> view) {
   if (!_isInvalidated && _viewApi != nullptr)
-    _viewApi->setSkiaView(nativeId, view);
+    _viewApi->setSkiaView(nativeId, std::move(view));
 }
 
 void RNSkManager::installBindings() {