@shopify/react-native-skia 0.1.155 → 0.1.156

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

@@ -1,100 +1,95 @@
 #pragma once
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include <RNSkJsView.h>
 #include <RNSkOpenGLCanvasProvider.h>
 #include <android/native_window.h>
 
 namespace RNSkia {
 
-    class RNSkBaseAndroidView {
-    public:
-        virtual void surfaceAvailable(jobject surface, int width, int height) = 0;
-
-        virtual void surfaceDestroyed() = 0;
-
-        virtual void surfaceSizeChanged(int width, int height) = 0;
-
-        virtual float getPixelDensity() = 0;
-
-        virtual void updateTouchPoints(jni::JArrayDouble touches) = 0;
-
-        virtual void setMode(std::string mode) = 0;
-
-        virtual void setShowDebugInfo(bool show) = 0;
-
-        virtual void viewDidUnmount() = 0;
-
-        virtual std::shared_ptr<RNSkView> getSkiaView() = 0;
-    };
-
-    template<typename T>
-    class RNSkAndroidView
-            : public T, public RNSkBaseAndroidView {
-    public:
-        RNSkAndroidView(
-                std::shared_ptr<RNSkia::RNSkPlatformContext> context) :
-                T(context,
-                  std::make_shared<RNSkOpenGLCanvasProvider>(
-                          std::bind(&RNSkia::RNSkView::requestRedraw, this),
-                          context)
-                ) {}
-
-        void surfaceAvailable(jobject surface, int width, int height) override {
-          std::static_pointer_cast<RNSkOpenGLCanvasProvider>(
-                  T::getCanvasProvider())->surfaceAvailable(surface, width, height);
-        }
-
-        void surfaceDestroyed() override {
-          std::static_pointer_cast<RNSkOpenGLCanvasProvider>(
-                  T::getCanvasProvider())->surfaceDestroyed();
-        }
-
-        void surfaceSizeChanged(int width, int height) override {
-          std::static_pointer_cast<RNSkOpenGLCanvasProvider>(
-                  T::getCanvasProvider())->surfaceSizeChanged(width, height);
-        }
-
-        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 updateTouchPoints(jni::JArrayDouble touches) override {
-          // Create touch points
-          std::vector<RNSkia::RNSkTouchInfo> points;
-          auto pin = touches.pin();
-          auto scale = getPixelDensity();
-          points.reserve(pin.size() / 5);
-          for (size_t i = 0; i < pin.size(); i += 5) {
-            RNSkTouchInfo point;
-            point.x = pin[i] / scale;
-            point.y = pin[i + 1] / scale;
-            point.force = pin[i + 2];
-            point.type = (RNSkia::RNSkTouchInfo::TouchType) pin[i + 3];
-            point.id = pin[i + 4];
-            points.push_back(point);
-          }
-          T::updateTouchState(points);
-        }
-
-        std::shared_ptr<RNSkView> getSkiaView() override {
-          return T::shared_from_this();
-        }
-
-    };
-}
+class RNSkBaseAndroidView {
+public:
+  virtual void surfaceAvailable(jobject surface, int width, int height) = 0;
+
+  virtual void surfaceDestroyed() = 0;
+
+  virtual void surfaceSizeChanged(int width, int height) = 0;
+
+  virtual float getPixelDensity() = 0;
+
+  virtual void updateTouchPoints(jni::JArrayDouble touches) = 0;
+
+  virtual void setMode(std::string mode) = 0;
+
+  virtual void setShowDebugInfo(bool show) = 0;
+
+  virtual void viewDidUnmount() = 0;
+
+  virtual std::shared_ptr<RNSkView> getSkiaView() = 0;
+};
+
+template <typename T>
+class RNSkAndroidView : public T, public RNSkBaseAndroidView {
+public:
+  explicit RNSkAndroidView(std::shared_ptr<RNSkia::RNSkPlatformContext> context)
+      : T(context,
+          std::make_shared<RNSkOpenGLCanvasProvider>(
+              std::bind(&RNSkia::RNSkView::requestRedraw, this), context)) {}
+
+  void surfaceAvailable(jobject surface, int width, int height) override {
+    std::static_pointer_cast<RNSkOpenGLCanvasProvider>(T::getCanvasProvider())
+        ->surfaceAvailable(surface, width, height);
+  }
+
+  void surfaceDestroyed() override {
+    std::static_pointer_cast<RNSkOpenGLCanvasProvider>(T::getCanvasProvider())
+        ->surfaceDestroyed();
+  }
+
+  void surfaceSizeChanged(int width, int height) override {
+    std::static_pointer_cast<RNSkOpenGLCanvasProvider>(T::getCanvasProvider())
+        ->surfaceSizeChanged(width, height);
+  }
+
+  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 updateTouchPoints(jni::JArrayDouble touches) override {
+    // Create touch points
+    std::vector<RNSkia::RNSkTouchInfo> points;
+    auto pin = touches.pin();
+    auto scale = getPixelDensity();
+    points.reserve(pin.size() / 5);
+    for (size_t i = 0; i < pin.size(); i += 5) {
+      RNSkTouchInfo point;
+      point.x = pin[i] / scale;
+      point.y = pin[i + 1] / scale;
+      point.force = pin[i + 2];
+      point.type = (RNSkia::RNSkTouchInfo::TouchType)pin[i + 3];
+      point.id = pin[i + 4];
+      points.push_back(point);
+    }
+    T::updateTouchState(points);
+  }
+
+  std::shared_ptr<RNSkView> getSkiaView() override {
+    return T::shared_from_this();
+  }
+};
+} // namespace RNSkia

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

@@ -1,91 +1,88 @@
 #include <RNSkOpenGLCanvasProvider.h>
 
+#include <memory>
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkSurface.h>
 #include <SkCanvas.h>
+#include <SkSurface.h>
 
 #pragma clang diagnostic pop
 
 namespace RNSkia {
 
-  RNSkOpenGLCanvasProvider::RNSkOpenGLCanvasProvider(
-          std::function<void()> requestRedraw,
-          std::shared_ptr<RNSkia::RNSkPlatformContext> context):
-          RNSkCanvasProvider(requestRedraw),
-          _context(context) {}
+RNSkOpenGLCanvasProvider::RNSkOpenGLCanvasProvider(
+    std::function<void()> requestRedraw,
+    std::shared_ptr<RNSkia::RNSkPlatformContext> context)
+    : RNSkCanvasProvider(requestRedraw), _context(context) {}
 
-  RNSkOpenGLCanvasProvider::~RNSkOpenGLCanvasProvider() {}
+RNSkOpenGLCanvasProvider::~RNSkOpenGLCanvasProvider() {}
 
-  float RNSkOpenGLCanvasProvider::getScaledWidth() {
-    return _width;
-  }
+float RNSkOpenGLCanvasProvider::getScaledWidth() { return _width; }
 
-  float RNSkOpenGLCanvasProvider::getScaledHeight() {
-    return _height;
-  }
+float RNSkOpenGLCanvasProvider::getScaledHeight() { return _height; }
 
-  void RNSkOpenGLCanvasProvider::renderToCanvas(const std::function<void(SkCanvas *)> &cb) {
-    if(_renderer != nullptr) {
-      _renderer->run(cb, _width, _height);
-    }
+void RNSkOpenGLCanvasProvider::renderToCanvas(
+    const std::function<void(SkCanvas *)> &cb) {
+  if (_renderer != nullptr) {
+    _renderer->run(cb, _width, _height);
   }
+}
 
-  void RNSkOpenGLCanvasProvider::surfaceAvailable(jobject surface, int width, int height) {
-    _width = width;
-    _height = height;
+void RNSkOpenGLCanvasProvider::surfaceAvailable(jobject surface, int width,
+                                                int height) {
+  _width = width;
+  _height = height;
 
-    if (_renderer == nullptr)
-    {
-      // Create renderer!
-      _renderer = std::make_unique<SkiaOpenGLRenderer>(surface);
+  if (_renderer == nullptr) {
+    // Create renderer!
+    _renderer = std::make_unique<SkiaOpenGLRenderer>(surface);
 
-      // Redraw
-      _requestRedraw();
-    }
+    // Redraw
+    _requestRedraw();
   }
-  void RNSkOpenGLCanvasProvider::surfaceDestroyed()  {
-    if (_renderer != nullptr)
-    {
-      // teardown
-      _renderer->teardown();
-
-      // Teardown renderer on the render thread since OpenGL demands
-      // same thread access for OpenGL contexts.
-      std::condition_variable cv;
-      std::mutex m;
+}
+void RNSkOpenGLCanvasProvider::surfaceDestroyed() {
+  if (_renderer != nullptr) {
+    // teardown
+    _renderer->teardown();
+
+    // Teardown renderer on the render thread since OpenGL demands
+    // same thread access for OpenGL contexts.
+    std::condition_variable cv;
+    std::mutex m;
+    std::unique_lock<std::mutex> lock(m);
+
+    _context->runOnRenderThread([&cv, &m, weakSelf = weak_from_this()]() {
+      // Lock
       std::unique_lock<std::mutex> lock(m);
 
-      _context->runOnRenderThread([&cv, &m, weakSelf = weak_from_this()]() {
-          // Lock
-          std::unique_lock<std::mutex> lock(m);
-
-          auto self = weakSelf.lock();
-          if(self) {
-            if(self->_renderer != nullptr) {
-              self->_renderer->run(nullptr, 0, 0);
-            }
-            // Remove renderer
-            self->_renderer = nullptr;
-          }
-          cv.notify_one();
-      });
-
-      cv.wait(lock);
-    }
+      auto self = weakSelf.lock();
+      if (self) {
+        if (self->_renderer != nullptr) {
+          self->_renderer->run(nullptr, 0, 0);
+        }
+        // Remove renderer
+        self->_renderer = nullptr;
+      }
+      cv.notify_one();
+    });
+
+    cv.wait(lock);
   }
+}
 
-  void RNSkOpenGLCanvasProvider::surfaceSizeChanged(int width, int height) {
-    if(width == 0 && height == 0) {
-      // Setting width/height to zero is nothing we need to care about when
-      // it comes to invalidating the surface.
-      return;
-    }
-    _width = width;
-    _height = height;
-
-    // Redraw after size change
-    _requestRedraw();
+void RNSkOpenGLCanvasProvider::surfaceSizeChanged(int width, int height) {
+  if (width == 0 && height == 0) {
+    // Setting width/height to zero is nothing we need to care about when
+    // it comes to invalidating the surface.
+    return;
   }
+  _width = width;
+  _height = height;
+
+  // Redraw after size change
+  _requestRedraw();
 }
+} // namespace RNSkia

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

@@ -2,6 +2,8 @@
 
 #include <fbjni/fbjni.h>
 
+#include <memory>
+
 #include <RNSkJsView.h>
 
 #include <SkiaOpenGLRenderer.h>
@@ -9,31 +11,32 @@
 
 namespace RNSkia {
 
-class RNSkOpenGLCanvasProvider :
-        public RNSkia::RNSkCanvasProvider,
-        public std::enable_shared_from_this<RNSkOpenGLCanvasProvider> {
+class RNSkOpenGLCanvasProvider
+    : public RNSkia::RNSkCanvasProvider,
+      public std::enable_shared_from_this<RNSkOpenGLCanvasProvider> {
 public:
-    RNSkOpenGLCanvasProvider(std::function<void()> requestRedraw,
-                             std::shared_ptr <RNSkia::RNSkPlatformContext> context);
+  RNSkOpenGLCanvasProvider(
+      std::function<void()> requestRedraw,
+      std::shared_ptr<RNSkia::RNSkPlatformContext> context);
 
-    ~RNSkOpenGLCanvasProvider();
+  ~RNSkOpenGLCanvasProvider();
 
-    float getScaledWidth() override;
+  float getScaledWidth() override;
 
-    float getScaledHeight() override;
+  float getScaledHeight() override;
 
-    void renderToCanvas(const std::function<void(SkCanvas * )> &cb) override;
+  void renderToCanvas(const std::function<void(SkCanvas *)> &cb) override;
 
-    void surfaceAvailable(jobject surface, int width, int height);
+  void surfaceAvailable(jobject surface, int width, int height);
 
-    void surfaceDestroyed();
+  void surfaceDestroyed();
 
-    void surfaceSizeChanged(int width, int height);
+  void surfaceSizeChanged(int width, int height);
 
 private:
-    std::unique_ptr <SkiaOpenGLRenderer> _renderer = nullptr;
-    std::shared_ptr <RNSkPlatformContext> _context;
-    float _width = -1;
-    float _height = -1;
+  std::unique_ptr<SkiaOpenGLRenderer> _renderer = nullptr;
+  std::shared_ptr<RNSkPlatformContext> _context;
+  float _width = -1;
+  float _height = -1;
 };
-}
+} // namespace RNSkia