@shopify/react-native-skia 0.1.155 → 0.1.157

package/android/cpp/jni/JniLoad.cpp

@@ -1,15 +1,15 @@
 #include "JniPlatformContext.h"
 #include "JniSkiaDrawView.h"
-#include "JniSkiaPictureView.h"
 #include "JniSkiaManager.h"
+#include "JniSkiaPictureView.h"
 #include <fbjni/fbjni.h>
 #include <jni.h>
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
-      RNSkia::JniSkiaManager::registerNatives();
-      RNSkia::JniSkiaDrawView::registerNatives();
-      RNSkia::JniSkiaPictureView::registerNatives();
-      RNSkia::JniPlatformContext::registerNatives();
+    RNSkia::JniSkiaManager::registerNatives();
+    RNSkia::JniSkiaDrawView::registerNatives();
+    RNSkia::JniSkiaPictureView::registerNatives();
+    RNSkia::JniPlatformContext::registerNatives();
   });
 }

package/android/cpp/jni/JniPlatformContext.cpp

@@ -4,139 +4,127 @@
 #include <thread>
 #include <utility>
 
-#include <RNSkMeasureTime.h>
 #include "SkData.h"
 #include "SkRefCnt.h"
-#include "SkTypes.h"
 #include "SkStream.h"
+#include "SkTypes.h"
+#include <RNSkMeasureTime.h>
 
-namespace RNSkia
-{
-
-    using namespace facebook;
+namespace RNSkia {
+
+namespace jsi = facebook::jsi;
+
+using TSelf = jni::local_ref<JniPlatformContext::jhybriddata>;
+
+void JniPlatformContext::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("initHybrid", JniPlatformContext::initHybrid),
+      makeNativeMethod("notifyDrawLoop",
+                       JniPlatformContext::notifyDrawLoopExternal),
+      makeNativeMethod("notifyTaskReady",
+                       JniPlatformContext::notifyTaskReadyExternal),
+  });
+}
+
+TSelf JniPlatformContext::initHybrid(jni::alias_ref<jhybridobject> jThis,
+                                     float pixelDensity) {
+  return makeCxxInstance(jThis, pixelDensity);
+}
+
+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::notifyTaskReadyExternal() {
+  _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) {
+  auto measure = RNSkMeasureTime("JniPlatformContext::performStreamOperation");
+
+  static auto method = javaPart_->getClass()->getMethod<jbyteArray(jstring)>(
+      "getJniStreamFromSource");
+
+  auto loader = [=]() -> void {
+    jni::ThreadScope ts;
+    jstring jstr =
+        (*jni::Environment::current()).NewStringUTF(sourceUri.c_str());
+
+    // Get the array with data from input stream from Java
+    auto array = method(javaPart_.get(), jstr);
+
+    if (array == nullptr) {
+      printf("Calling getJniStreamFromSource failed\n");
+      return;
+    }
 
-    using TSelf = jni::local_ref<JniPlatformContext::jhybriddata>;
+    // Allocate buffer for java byte array
+    jsize num_bytes = jni::Environment::current()->GetArrayLength(array.get());
+    char *buffer = reinterpret_cast<char *>(malloc(num_bytes + 1));
 
-    void JniPlatformContext::registerNatives()
-    {
-        registerHybrid({
-            makeNativeMethod("initHybrid", JniPlatformContext::initHybrid),
-            makeNativeMethod("notifyDrawLoop", JniPlatformContext::notifyDrawLoopExternal),
-            makeNativeMethod("notifyTaskReady", JniPlatformContext::notifyTaskReadyExternal),
-        });
+    if (!buffer) {
+      printf("Buff Fail\n");
+      return;
     }
 
-    TSelf JniPlatformContext::initHybrid(jni::alias_ref<jhybridobject> jThis, float pixelDensity)
-    {
-        return makeCxxInstance(jThis, pixelDensity);
+    jbyte *elements =
+        jni::Environment::current()->GetByteArrayElements(array.get(), nullptr);
+    if (!elements) {
+      printf("Element Fail\n");
+      return;
     }
 
-    void JniPlatformContext::startDrawLoop()
-    {
-        jni::ThreadScope ts;
-        // Start drawing loop
-        static auto method = javaPart_->getClass()->getMethod<void(void)>("beginDrawLoop");
-        method(javaPart_.get());
-    }
+    // Copy data from java array to buffer
+    memcpy(buffer, elements, num_bytes);
+    buffer[num_bytes] = 0;
 
-    void JniPlatformContext::stopDrawLoop()
-    {
-        jni::ThreadScope ts;
-        // Stop drawing loop
-        static auto method = javaPart_->getClass()->getMethod<void(void)>("endDrawLoop");
-        method(javaPart_.get());
-    }
+    jni::Environment::current()->ReleaseByteArrayElements(array.get(), elements,
+                                                          JNI_ABORT);
 
-    void JniPlatformContext::notifyDrawLoopExternal()
-    {
-        jni::ThreadScope ts;
-        _onNotifyDrawLoop();
-    }
+    // Copy malloced data and give ownership to SkData
+    auto data = SkData::MakeFromMalloc(buffer, num_bytes);
+    auto skStream = SkMemoryStream::Make(data);
 
-    void JniPlatformContext::notifyTaskReadyExternal()
-    {
-        _taskMutex->lock();
-        auto task = _taskCallbacks.front();
-        if (task != nullptr)
-        {
-            _taskCallbacks.pop();
-            _taskMutex->unlock();
-            task();
-        }
-        else
-        {
-            _taskMutex->unlock();
-        }
-    }
+    // Perform operation
+    op(std::move(skStream));
+  };
 
-    void JniPlatformContext::performStreamOperation(
-        const std::string &sourceUri,
-        const std::function<void(std::unique_ptr<SkStreamAsset>)> &op)
-    {
-        auto measure =
-            RNSkMeasureTime("JniPlatformContext::performStreamOperation");
-
-        static auto method = javaPart_->getClass()->getMethod<jbyteArray(jstring)>(
-            "getJniStreamFromSource");
-
-        auto loader = [=]() -> void
-        {
-            jni::ThreadScope ts;
-            jstring jstr =
-                (*jni::Environment::current()).NewStringUTF(sourceUri.c_str());
-
-            // Get the array with data from input stream from Java
-            auto array = method(javaPart_.get(), jstr);
-
-            if (array == nullptr)
-            {
-                printf("Calling getJniStreamFromSource failed\n");
-                return;
-            }
-
-            // Allocate buffer for java byte array
-            jsize num_bytes =
-                jni::Environment::current()->GetArrayLength(array.get());
-            char *buffer = (char *)malloc(num_bytes + 1);
-
-            if (!buffer)
-            {
-                printf("Buff Fail\n");
-                return;
-            }
-
-            jbyte *elements = jni::Environment::current()->GetByteArrayElements(
-                array.get(), nullptr);
-            if (!elements)
-            {
-                printf("Element Fail\n");
-                return;
-            }
-
-            // Copy data from java array to buffer
-            memcpy(buffer, elements, num_bytes);
-            buffer[num_bytes] = 0;
-
-            jni::Environment::current()->ReleaseByteArrayElements(
-                array.get(), elements, JNI_ABORT);
-
-            // Copy malloced data and give ownership to SkData
-            auto data = SkData::MakeFromMalloc(buffer, num_bytes);
-            auto skStream = SkMemoryStream::Make(data);
-
-            // Perform operation
-            op(std::move(skStream));
-        };
-
-        // Fire and forget the thread - will be resolved on completion
-        std::thread(loader).detach();
-    }
+  // Fire and forget the thread - will be resolved on completion
+  std::thread(loader).detach();
+}
 
-    void JniPlatformContext::raiseError(const std::exception &err)
-    {
-        jni::ThreadScope ts;
-        static auto method = javaPart_->getClass()->getMethod<void(std::string)>("raise");
-        method(javaPart_.get(), std::string(err.what()));
-    }
+void JniPlatformContext::raiseError(const std::exception &err) {
+  jni::ThreadScope ts;
+  static auto method =
+      javaPart_->getClass()->getMethod<void(std::string)>("raise");
+  method(javaPart_.get(), std::string(err.what()));
+}
 
 } // namespace RNSkia

package/android/cpp/jni/JniSkiaManager.cpp

@@ -10,35 +10,33 @@
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 // JNI binding
 void JniSkiaManager::registerNatives() {
-    registerHybrid({
-        makeNativeMethod("initHybrid", JniSkiaManager::initHybrid),
-        makeNativeMethod("initializeRuntime", JniSkiaManager::initializeRuntime),
-        makeNativeMethod("invalidate", JniSkiaManager::invalidate),
-    });
+  registerHybrid({
+      makeNativeMethod("initHybrid", JniSkiaManager::initHybrid),
+      makeNativeMethod("initializeRuntime", JniSkiaManager::initializeRuntime),
+      makeNativeMethod("invalidate", JniSkiaManager::invalidate),
+  });
 }
 
 // JNI init
-jni::local_ref<jni::HybridClass<JniSkiaManager>::jhybriddata> JniSkiaManager::initHybrid(
-    jni::alias_ref<jhybridobject> jThis,
-    jlong jsContext,
-    JSCallInvokerHolder jsCallInvokerHolder,
-    JavaPlatformContext skiaContext) {
-
-    // cast from JNI hybrid objects to C++ instances
-    return makeCxxInstance(
-        jThis,
-        reinterpret_cast<jsi::Runtime *>(jsContext),
-        jsCallInvokerHolder->cthis()->getCallInvoker(),
-        skiaContext->cthis());
+jni::local_ref<jni::HybridClass<JniSkiaManager>::jhybriddata>
+JniSkiaManager::initHybrid(jni::alias_ref<jhybridobject> jThis, jlong jsContext,
+                           JSCallInvokerHolder jsCallInvokerHolder,
+                           JavaPlatformContext skiaContext) {
+
+  // cast from JNI hybrid objects to C++ instances
+  return makeCxxInstance(jThis, reinterpret_cast<jsi::Runtime *>(jsContext),
+                         jsCallInvokerHolder->cthis()->getCallInvoker(),
+                         skiaContext->cthis());
 }
 
 void JniSkiaManager::initializeRuntime() {
-    // Create the cross platform skia manager
-    _skManager = std::make_shared<RNSkManager>(_jsRuntime, _jsCallInvoker, _context);
+  // Create the cross platform skia manager
+  _skManager =
+      std::make_shared<RNSkManager>(_jsRuntime, _jsCallInvoker, _context);
 }
 
 } // namespace RNSkia

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

@@ -1,75 +1,71 @@
 #pragma once
 
-#include <fbjni/fbjni.h>
 #include <ReactCommon/CallInvokerHolder.h>
+#include <fbjni/fbjni.h>
 
-#include <queue>
-#include <mutex>
+#include <exception>
 #include <functional>
 #include <memory>
+#include <mutex>
+#include <queue>
 #include <string>
-#include <exception>
 
 #include "RNSkPlatformContext.h"
 
 class SkStreamAsset;
-namespace RNSkia
-{
+namespace RNSkia {
 
-    using namespace facebook;
+namespace jsi = facebook::jsi;
+namespace jni = facebook::jni;
 
-    using JSCallInvokerHolder =
-        jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>;
+using JSCallInvokerHolder =
+    jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>;
 
-    class JniPlatformContext : public jni::HybridClass<JniPlatformContext>
-    {
-    public:
-        static auto constexpr kJavaDescriptor = "Lcom/shopify/reactnative/skia/PlatformContext;";
+class JniPlatformContext : public jni::HybridClass<JniPlatformContext> {
+public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/shopify/reactnative/skia/PlatformContext;";
 
-        static jni::local_ref<jhybriddata> initHybrid(
-            jni::alias_ref<jhybridobject> jThis,
-            const float);
+  static jni::local_ref<jhybriddata>
+  initHybrid(jni::alias_ref<jhybridobject> jThis, const float);
 
-        static void registerNatives();
+  static void registerNatives();
 
-        void performStreamOperation(
-            const std::string &sourceUri,
-            const std::function<void(std::unique_ptr<SkStreamAsset>)> &op);
+  void performStreamOperation(
+      const std::string &sourceUri,
+      const std::function<void(std::unique_ptr<SkStreamAsset>)> &op);
 
-        void raiseError(const std::exception &err);
+  void raiseError(const std::exception &err);
 
-        void startDrawLoop();
-        void stopDrawLoop();
+  void startDrawLoop();
+  void stopDrawLoop();
 
-        void notifyDrawLoopExternal();
+  void notifyDrawLoopExternal();
 
-        void notifyTaskReadyExternal();
+  void notifyTaskReadyExternal();
 
-        float getPixelDensity() { return _pixelDensity; }
+  float getPixelDensity() { return _pixelDensity; }
 
-        void setOnNotifyDrawLoop(const std::function<void(void)>& callback) {
-            _onNotifyDrawLoop = callback;
-        }
+  void setOnNotifyDrawLoop(const std::function<void(void)> &callback) {
+    _onNotifyDrawLoop = callback;
+  }
 
-    private:
-        friend HybridBase;
-        jni::global_ref<JniPlatformContext::javaobject> javaPart_;
+private:
+  friend HybridBase;
+  jni::global_ref<JniPlatformContext::javaobject> javaPart_;
 
-        float _pixelDensity;
+  float _pixelDensity;
 
-        std::function<void(void)> _onNotifyDrawLoop;
+  std::function<void(void)> _onNotifyDrawLoop;
 
-        std::queue<std::function<void()>> _taskCallbacks;
+  std::queue<std::function<void()>> _taskCallbacks;
 
-        std::shared_ptr<std::mutex> _taskMutex;
+  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)
-        {
-        }
-    };
+  explicit JniPlatformContext(
+      jni::alias_ref<JniPlatformContext::jhybridobject> jThis,
+      const float pixelDensity)
+      : _taskMutex(std::make_shared<std::mutex>()),
+        javaPart_(jni::make_global(jThis)), _pixelDensity(pixelDensity) {}
+};
 } // namespace RNSkia

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

@@ -1,68 +1,65 @@
 #pragma once
 
 #include <memory>
+#include <string>
 
 #include <fbjni/fbjni.h>
 #include <jni.h>
 #include <jsi/jsi.h>
 
 #include <JniSkiaManager.h>
+#include <RNSkAndroidView.h>
 
 namespace RNSkia {
-    using namespace facebook;
-    using namespace jni;
-
-    class JniSkiaBaseView {
-    public:
-        JniSkiaBaseView(jni::alias_ref<JniSkiaManager::javaobject> skiaManager,
-                        std::shared_ptr<RNSkBaseAndroidView> skiaView) :
-                _manager(skiaManager->cthis()),
-                _skiaView(skiaView) {}
-
-        ~JniSkiaBaseView() {}
-
-        std::shared_ptr<RNSkManager> getSkiaManager() { return _manager->getSkiaManager(); };
-
-    protected:
-        virtual void updateTouchPoints(jni::JArrayDouble touches) {
-          _skiaView->updateTouchPoints(touches);
-        }
-
-        virtual void surfaceAvailable(jobject surface, int width, int height) {
-          _skiaView->surfaceAvailable(surface, width, height);
-        }
-
-        virtual void surfaceSizeChanged(int width, int height) {
-          _skiaView->surfaceSizeChanged(width, height);
-        }
-
-        virtual void surfaceDestroyed() {
-          _skiaView->surfaceDestroyed();
-        }
-
-        virtual void setMode(std::string mode) {
-          _skiaView->setMode(mode);
-        }
-
-        virtual void setDebugMode(bool show) {
-          _skiaView->setShowDebugInfo(show);
-        }
-
-        virtual void registerView(int nativeId) {
-          getSkiaManager()->registerSkiaView(nativeId,
-                                             _skiaView->getSkiaView());
-        }
-
-        virtual void unregisterView() {
-          getSkiaManager()->setSkiaView(_skiaView->getSkiaView()->getNativeId(), nullptr);
-          getSkiaManager()->unregisterSkiaView(
-                  _skiaView->getSkiaView()->getNativeId());
-          _skiaView->viewDidUnmount();
-        }
-
-    private:
-        JniSkiaManager *_manager;
-        std::shared_ptr<RNSkBaseAndroidView> _skiaView;
-    };
+
+namespace jsi = facebook::jsi;
+
+class JniSkiaBaseView {
+public:
+  JniSkiaBaseView(jni::alias_ref<JniSkiaManager::javaobject> skiaManager,
+                  std::shared_ptr<RNSkBaseAndroidView> skiaView)
+      : _manager(skiaManager->cthis()), _skiaView(skiaView) {}
+
+  ~JniSkiaBaseView() {}
+
+  std::shared_ptr<RNSkManager> getSkiaManager() {
+    return _manager->getSkiaManager();
+  }
+
+protected:
+  virtual void updateTouchPoints(jni::JArrayDouble touches) {
+    _skiaView->updateTouchPoints(touches);
+  }
+
+  virtual void surfaceAvailable(jobject surface, int width, int height) {
+    _skiaView->surfaceAvailable(surface, width, height);
+  }
+
+  virtual void surfaceSizeChanged(int width, int height) {
+    _skiaView->surfaceSizeChanged(width, height);
+  }
+
+  virtual void surfaceDestroyed() { _skiaView->surfaceDestroyed(); }
+
+  virtual void setMode(std::string mode) { _skiaView->setMode(mode); }
+
+  virtual void setDebugMode(bool show) { _skiaView->setShowDebugInfo(show); }
+
+  virtual void registerView(int nativeId) {
+    getSkiaManager()->registerSkiaView(nativeId, _skiaView->getSkiaView());
+  }
+
+  virtual void unregisterView() {
+    getSkiaManager()->setSkiaView(_skiaView->getSkiaView()->getNativeId(),
+                                  nullptr);
+    getSkiaManager()->unregisterSkiaView(
+        _skiaView->getSkiaView()->getNativeId());
+    _skiaView->viewDidUnmount();
+  }
+
+private:
+  JniSkiaManager *_manager;
+  std::shared_ptr<RNSkBaseAndroidView> _skiaView;
+};
 
 } // namespace RNSkia