@shopify/react-native-skia 0.1.155 → 0.1.157

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

@@ -1,95 +1,90 @@
 #pragma once
 
 #include <memory>
+#include <string>
 
 #include <fbjni/fbjni.h>
 #include <jni.h>
 #include <jsi/jsi.h>
 
-#include <RNSkJsView.h>
-#include <RNSkAndroidView.h>
 #include <JniSkiaBaseView.h>
 #include <JniSkiaManager.h>
+#include <RNSkAndroidView.h>
+#include <RNSkJsView.h>
 
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 #include <fbjni/detail/Hybrid.h>
 
 namespace RNSkia {
-    using namespace facebook;
-    using namespace jni;
-
-    class JniSkiaDrawView
-            : public HybridClass<JniSkiaDrawView>, public JniSkiaBaseView {
-    public:
-        static auto constexpr kJavaDescriptor = "Lcom/shopify/reactnative/skia/SkiaDrawView;";
-
-        static jni::local_ref<jhybriddata>
-        initHybrid(jni::alias_ref<jhybridobject> jThis,
-                   jni::alias_ref<JniSkiaManager::javaobject> skiaManager) {
-          return makeCxxInstance(jThis, skiaManager);
-        }
-
-        static void registerNatives() {
-          registerHybrid({
-                                 makeNativeMethod("initHybrid", JniSkiaDrawView::initHybrid),
-                                 makeNativeMethod("surfaceAvailable",
-                                                  JniSkiaDrawView::surfaceAvailable),
-                                 makeNativeMethod("surfaceDestroyed",
-                                                  JniSkiaDrawView::surfaceDestroyed),
-                                 makeNativeMethod("surfaceSizeChanged",
-                                                  JniSkiaDrawView::surfaceSizeChanged),
-                                 makeNativeMethod("setMode", JniSkiaDrawView::setMode),
-                                 makeNativeMethod("setDebugMode", JniSkiaDrawView::setDebugMode),
-                                 makeNativeMethod("updateTouchPoints",
-                                                  JniSkiaDrawView::updateTouchPoints),
-                                 makeNativeMethod("registerView", JniSkiaDrawView::registerView),
-                                 makeNativeMethod("unregisterView", JniSkiaDrawView::unregisterView)
-                         });
-        }
-
-    protected:
-        void updateTouchPoints(jni::JArrayDouble touches) override {
-          JniSkiaBaseView::updateTouchPoints(touches);
-        }
-
-        void surfaceAvailable(jobject surface, int width, int height) override {
-          JniSkiaBaseView::surfaceAvailable(surface, width, height);
-        }
-
-        void surfaceSizeChanged(int width, int height) override {
-          JniSkiaBaseView::surfaceSizeChanged(width, height);
-        }
-
-        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 {
-          JniSkiaBaseView::registerView(nativeId);
-        }
-
-        void unregisterView() override {
-          JniSkiaBaseView::unregisterView();
-        }
-
-    private:
-        friend HybridBase;
-
-        explicit JniSkiaDrawView(jni::alias_ref<jhybridobject> jThis,
-                                 jni::alias_ref<JniSkiaManager::javaobject> skiaManager) :
-                JniSkiaBaseView(skiaManager,
-                                std::make_shared<RNSkAndroidView<RNSkia::RNSkJsView>>(
-                                        skiaManager->cthis()->getPlatformContext())) {
-        }
-
-        jni::global_ref<javaobject> javaPart_;
-    };
+namespace jsi = facebook::jsi;
+namespace jni = facebook::jni;
+
+class JniSkiaDrawView : public jni::HybridClass<JniSkiaDrawView>,
+                        public JniSkiaBaseView {
+public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/shopify/reactnative/skia/SkiaDrawView;";
+
+  static jni::local_ref<jhybriddata>
+  initHybrid(jni::alias_ref<jhybridobject> jThis,
+             jni::alias_ref<JniSkiaManager::javaobject> skiaManager) {
+    return makeCxxInstance(jThis, skiaManager);
+  }
+
+  static void registerNatives() {
+    registerHybrid(
+        {makeNativeMethod("initHybrid", JniSkiaDrawView::initHybrid),
+         makeNativeMethod("surfaceAvailable",
+                          JniSkiaDrawView::surfaceAvailable),
+         makeNativeMethod("surfaceDestroyed",
+                          JniSkiaDrawView::surfaceDestroyed),
+         makeNativeMethod("surfaceSizeChanged",
+                          JniSkiaDrawView::surfaceSizeChanged),
+         makeNativeMethod("setMode", JniSkiaDrawView::setMode),
+         makeNativeMethod("setDebugMode", JniSkiaDrawView::setDebugMode),
+         makeNativeMethod("updateTouchPoints",
+                          JniSkiaDrawView::updateTouchPoints),
+         makeNativeMethod("registerView", JniSkiaDrawView::registerView),
+         makeNativeMethod("unregisterView", JniSkiaDrawView::unregisterView)});
+  }
+
+protected:
+  void updateTouchPoints(jni::JArrayDouble touches) override {
+    JniSkiaBaseView::updateTouchPoints(touches);
+  }
+
+  void surfaceAvailable(jobject surface, int width, int height) override {
+    JniSkiaBaseView::surfaceAvailable(surface, width, height);
+  }
+
+  void surfaceSizeChanged(int width, int height) override {
+    JniSkiaBaseView::surfaceSizeChanged(width, height);
+  }
+
+  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 {
+    JniSkiaBaseView::registerView(nativeId);
+  }
+
+  void unregisterView() override { JniSkiaBaseView::unregisterView(); }
+
+private:
+  friend HybridBase;
+
+  explicit JniSkiaDrawView(
+      jni::alias_ref<jhybridobject> jThis,
+      jni::alias_ref<JniSkiaManager::javaobject> skiaManager)
+      : JniSkiaBaseView(skiaManager,
+                        std::make_shared<RNSkAndroidView<RNSkia::RNSkJsView>>(
+                            skiaManager->cthis()->getPlatformContext())) {}
+
+  jni::global_ref<javaobject> javaPart_;
+};
 
 } // namespace RNSkia

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

@@ -8,14 +8,14 @@
 
 #include <JniPlatformContext.h>
 #include <RNSkAndroidPlatformContext.h>
-#include <RNSkManager.h>
 #include <RNSkLog.h>
+#include <RNSkManager.h>
 
 namespace RNSkia {
 
 class RNSkManager;
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 using JSCallInvokerHolder =
     jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>;
@@ -23,57 +23,55 @@ using JSCallInvokerHolder =
 using JavaPlatformContext = jni::alias_ref<JniPlatformContext::javaobject>;
 
 class JniSkiaManager : public jni::HybridClass<JniSkiaManager> {
-   public:
-    static auto constexpr kJavaDescriptor = "Lcom/shopify/reactnative/skia/SkiaManager;";
-    static auto constexpr TAG = "ReactNativeSkia";
-
-    static jni::local_ref<jni::HybridClass<JniSkiaManager>::jhybriddata> initHybrid(
-        jni::alias_ref<jhybridobject> jThis,
-        jlong jsContext,
-        JSCallInvokerHolder jsCallInvokerHolder,
-        JavaPlatformContext platformContext);
-
-    static void registerNatives();
-
-    JniSkiaManager() {}
-    ~JniSkiaManager() {
-        RNSkLogger::logToConsole("JniSkiaManager dtor");
-    }
-
-    explicit JniSkiaManager(
-        jni::alias_ref<JniSkiaManager::jhybridobject> jThis,
-        jsi::Runtime *runtime,
-        std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker,
-        JniPlatformContext* platformContext)
-        : _javaPart(jni::make_global(jThis)),
-          _jsRuntime(runtime),
-          _jsCallInvoker(jsCallInvoker),
-          _context(std::make_shared<RNSkAndroidPlatformContext>(platformContext, runtime, jsCallInvoker)) {
-
-    }
-
-    std::shared_ptr<RNSkAndroidPlatformContext> getPlatformContext() { return _context; }
-    std::shared_ptr<RNSkManager> getSkiaManager() { return _skManager; }
-
-    void invalidate() {
-        _context->stopDrawLoop();
-        _context->notifyDrawLoop(true);
-        _skManager = nullptr;
-        _context = nullptr;
-    }
-
-   private:
-    friend HybridBase;
-
-    std::shared_ptr<RNSkManager> _skManager;
-
-    jni::global_ref<JniSkiaManager::javaobject> _javaPart;
-
-    jsi::Runtime *_jsRuntime;
-    std::shared_ptr<facebook::react::CallInvoker> _jsCallInvoker;
-    std::shared_ptr<RNSkAndroidPlatformContext> _context;
-
-    void initializeRuntime();
+public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/shopify/reactnative/skia/SkiaManager;";
+  static auto constexpr TAG = "ReactNativeSkia";
+
+  static jni::local_ref<jni::HybridClass<JniSkiaManager>::jhybriddata>
+  initHybrid(jni::alias_ref<jhybridobject> jThis, jlong jsContext,
+             JSCallInvokerHolder jsCallInvokerHolder,
+             JavaPlatformContext platformContext);
+
+  static void registerNatives();
+
+  JniSkiaManager() {}
+  ~JniSkiaManager() { RNSkLogger::logToConsole("JniSkiaManager dtor"); }
+
+  explicit JniSkiaManager(
+      jni::alias_ref<JniSkiaManager::jhybridobject> jThis,
+      jsi::Runtime *runtime,
+      std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker,
+      JniPlatformContext *platformContext)
+      : _javaPart(jni::make_global(jThis)), _jsRuntime(runtime),
+        _jsCallInvoker(jsCallInvoker),
+        _context(std::make_shared<RNSkAndroidPlatformContext>(
+            platformContext, runtime, jsCallInvoker)) {}
+
+  std::shared_ptr<RNSkAndroidPlatformContext> getPlatformContext() {
+    return _context;
+  }
+  std::shared_ptr<RNSkManager> getSkiaManager() { return _skManager; }
+
+  void invalidate() {
+    _context->stopDrawLoop();
+    _context->notifyDrawLoop(true);
+    _skManager = nullptr;
+    _context = nullptr;
+  }
+
+private:
+  friend HybridBase;
+
+  std::shared_ptr<RNSkManager> _skManager;
+
+  jni::global_ref<JniSkiaManager::javaobject> _javaPart;
+
+  jsi::Runtime *_jsRuntime;
+  std::shared_ptr<facebook::react::CallInvoker> _jsCallInvoker;
+  std::shared_ptr<RNSkAndroidPlatformContext> _context;
+
+  void initializeRuntime();
 };
 
 } // namespace RNSkia

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

@@ -1,96 +1,92 @@
 #pragma once
 
 #include <memory>
+#include <string>
 
 #include <fbjni/fbjni.h>
 #include <jni.h>
 #include <jsi/jsi.h>
 
-#include <RNSkPictureView.h>
-#include <RNSkAndroidView.h>
 #include <JniSkiaBaseView.h>
 #include <JniSkiaManager.h>
+#include <RNSkAndroidView.h>
+#include <RNSkPictureView.h>
 
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 #include <fbjni/detail/Hybrid.h>
 
 namespace RNSkia {
-    using namespace facebook;
-    using namespace jni;
-
-    class JniSkiaPictureView
-            : public HybridClass<JniSkiaPictureView>, public JniSkiaBaseView {
-    public:
-        static auto constexpr kJavaDescriptor = "Lcom/shopify/reactnative/skia/SkiaPictureView;";
-
-        static jni::local_ref<jhybriddata>
-        initHybrid(jni::alias_ref<jhybridobject> jThis,
-                   jni::alias_ref<JniSkiaManager::javaobject> skiaManager) {
-          return makeCxxInstance(jThis, skiaManager);
-        }
-
-        static void registerNatives() {
-          registerHybrid({
-                                 makeNativeMethod("initHybrid", JniSkiaPictureView::initHybrid),
-                                 makeNativeMethod("surfaceAvailable",
-                                                  JniSkiaPictureView::surfaceAvailable),
-                                 makeNativeMethod("surfaceDestroyed",
-                                                  JniSkiaPictureView::surfaceDestroyed),
-                                 makeNativeMethod("surfaceSizeChanged",
-                                                  JniSkiaPictureView::surfaceSizeChanged),
-                                 makeNativeMethod("setMode", JniSkiaPictureView::setMode),
-                                 makeNativeMethod("setDebugMode", JniSkiaPictureView::setDebugMode),
-                                 makeNativeMethod("updateTouchPoints",
-                                                  JniSkiaPictureView::updateTouchPoints),
-                                 makeNativeMethod("registerView", JniSkiaPictureView::registerView),
-                                 makeNativeMethod("unregisterView",
-                                                  JniSkiaPictureView::unregisterView)
-                         });
-        }
-
-    protected:
-        void updateTouchPoints(jni::JArrayDouble touches) override {
-          JniSkiaBaseView::updateTouchPoints(touches);
-        }
-
-        void surfaceAvailable(jobject surface, int width, int height) override {
-          JniSkiaBaseView::surfaceAvailable(surface, width, height);
-        }
-
-        void surfaceSizeChanged(int width, int height) override {
-          JniSkiaBaseView::surfaceSizeChanged(width, height);
-        }
-
-        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 {
-          JniSkiaBaseView::registerView(nativeId);
-        }
-
-        void unregisterView() override {
-          JniSkiaBaseView::unregisterView();
-        }
-
-    private:
-        friend HybridBase;
-
-        explicit JniSkiaPictureView(jni::alias_ref<jhybridobject> jThis,
-                                    jni::alias_ref<JniSkiaManager::javaobject> skiaManager) :
-                JniSkiaBaseView(skiaManager,
-                                std::make_shared<RNSkAndroidView<RNSkia::RNSkPictureView>>(
-                                        skiaManager->cthis()->getPlatformContext())) {
-        }
-
-        jni::global_ref<javaobject> javaPart_;
-    };
+namespace jsi = facebook::jsi;
+namespace jni = facebook::jni;
+
+class JniSkiaPictureView : public jni::HybridClass<JniSkiaPictureView>,
+                           public JniSkiaBaseView {
+public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/shopify/reactnative/skia/SkiaPictureView;";
+
+  static jni::local_ref<jhybriddata>
+  initHybrid(jni::alias_ref<jhybridobject> jThis,
+             jni::alias_ref<JniSkiaManager::javaobject> skiaManager) {
+    return makeCxxInstance(jThis, skiaManager);
+  }
+
+  static void registerNatives() {
+    registerHybrid(
+        {makeNativeMethod("initHybrid", JniSkiaPictureView::initHybrid),
+         makeNativeMethod("surfaceAvailable",
+                          JniSkiaPictureView::surfaceAvailable),
+         makeNativeMethod("surfaceDestroyed",
+                          JniSkiaPictureView::surfaceDestroyed),
+         makeNativeMethod("surfaceSizeChanged",
+                          JniSkiaPictureView::surfaceSizeChanged),
+         makeNativeMethod("setMode", JniSkiaPictureView::setMode),
+         makeNativeMethod("setDebugMode", JniSkiaPictureView::setDebugMode),
+         makeNativeMethod("updateTouchPoints",
+                          JniSkiaPictureView::updateTouchPoints),
+         makeNativeMethod("registerView", JniSkiaPictureView::registerView),
+         makeNativeMethod("unregisterView",
+                          JniSkiaPictureView::unregisterView)});
+  }
+
+protected:
+  void updateTouchPoints(jni::JArrayDouble touches) override {
+    JniSkiaBaseView::updateTouchPoints(touches);
+  }
+
+  void surfaceAvailable(jobject surface, int width, int height) override {
+    JniSkiaBaseView::surfaceAvailable(surface, width, height);
+  }
+
+  void surfaceSizeChanged(int width, int height) override {
+    JniSkiaBaseView::surfaceSizeChanged(width, height);
+  }
+
+  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 {
+    JniSkiaBaseView::registerView(nativeId);
+  }
+
+  void unregisterView() override { JniSkiaBaseView::unregisterView(); }
+
+private:
+  friend HybridBase;
+
+  explicit JniSkiaPictureView(
+      jni::alias_ref<jhybridobject> jThis,
+      jni::alias_ref<JniSkiaManager::javaobject> skiaManager)
+      : JniSkiaBaseView(
+            skiaManager,
+            std::make_shared<RNSkAndroidView<RNSkia::RNSkPictureView>>(
+                skiaManager->cthis()->getPlatformContext())) {}
+
+  jni::global_ref<javaobject> javaPart_;
+};
 
 } // namespace RNSkia

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

@@ -1,54 +1,45 @@
 #pragma once
 
+#include <exception>
 #include <functional>
-#include <string>
 #include <memory>
-#include <exception>
+#include <string>
 
 #include <JniPlatformContext.h>
 #include <RNSkPlatformContext.h>
 
 namespace RNSkia {
-    using namespace facebook;
-
-    class RNSkAndroidPlatformContext: public RNSkPlatformContext {
-    public:
-        RNSkAndroidPlatformContext(JniPlatformContext* jniPlatformContext,
-                                   jsi::Runtime *runtime,
-                                   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);
-            });
-        }
-
-
-    void performStreamOperation(
-            const std::string &sourceUri,
-            const std::function<void(std::unique_ptr<SkStreamAsset>)> &op) override {
-        _jniPlatformContext->performStreamOperation(sourceUri, op);
-    }
-
-    void raiseError(const std::exception &err) override {
-        _jniPlatformContext->raiseError(err);
-    }
-
-    void startDrawLoop() override {
-        _jniPlatformContext->startDrawLoop();
-    }
-
-    void stopDrawLoop() override {
-        _jniPlatformContext->stopDrawLoop();
-    }
-
-    private:
-
-        JniPlatformContext* _jniPlatformContext;
-    };
-
-}
-
+namespace jsi = facebook::jsi;
+
+class RNSkAndroidPlatformContext : public RNSkPlatformContext {
+public:
+  RNSkAndroidPlatformContext(
+      JniPlatformContext *jniPlatformContext, jsi::Runtime *runtime,
+      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); });
+  }
+
+  void performStreamOperation(
+      const std::string &sourceUri,
+      const std::function<void(std::unique_ptr<SkStreamAsset>)> &op) override {
+    _jniPlatformContext->performStreamOperation(sourceUri, op);
+  }
+
+  void raiseError(const std::exception &err) override {
+    _jniPlatformContext->raiseError(err);
+  }
+
+  void startDrawLoop() override { _jniPlatformContext->startDrawLoop(); }
+
+  void stopDrawLoop() override { _jniPlatformContext->stopDrawLoop(); }
+
+private:
+  JniPlatformContext *_jniPlatformContext;
+};
+
+} // namespace RNSkia