@shopify/react-native-skia 0.1.162 → 0.1.164

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

@@ -24,6 +24,8 @@ public:
         [this]() { notifyDrawLoop(false); });
   }
 
+  ~RNSkAndroidPlatformContext() { stopDrawLoop(); }
+
   void performStreamOperation(
       const std::string &sourceUri,
       const std::function<void(std::unique_ptr<SkStreamAsset>)> &op) override {

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

@@ -5,8 +5,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkCanvas.h>
-#include <SkSurface.h>
+#include "SkCanvas.h"
+#include "SkSurface.h"
 
 #pragma clang diagnostic pop
 

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

@@ -6,7 +6,7 @@
 
 #include <RNSkJsView.h>
 
-#include <SkiaOpenGLRenderer.h>
+#include "SkiaOpenGLRenderer.h"
 #include <android/native_window.h>
 
 namespace RNSkia {
@@ -39,4 +39,4 @@ private:
   float _width = -1;
   float _height = -1;
 };
-} // namespace RNSkia
+} // namespace RNSkia

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

@@ -16,12 +16,12 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#include "SkCanvas.h"
+#include "SkColorSpace.h"
+#include "SkPicture.h"
+#include "SkSurface.h"
 #include "include/gpu/GrDirectContext.h"
 #include "include/gpu/gl/GrGLInterface.h"
-#include <SkCanvas.h>
-#include <SkColorSpace.h>
-#include <SkPicture.h>
-#include <SkSurface.h>
 
 #pragma clang diagnostic pop
 
@@ -127,4 +127,4 @@ private:
 
   std::atomic<RenderState> _renderState = {RenderState::Initializing};
 };
-} // namespace RNSkia
+} // namespace RNSkia

package/cpp/api/JsiSkCanvas.h

@@ -22,14 +22,14 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkCanvas.h>
-#include <SkFont.h>
-#include <SkPaint.h>
-#include <SkPath.h>
-#include <SkPicture.h>
-#include <SkRegion.h>
-#include <SkSurface.h>
-#include <SkTypeface.h>
+#include "SkCanvas.h"
+#include "SkFont.h"
+#include "SkPaint.h"
+#include "SkPath.h"
+#include "SkPicture.h"
+#include "SkRegion.h"
+#include "SkSurface.h"
+#include "SkTypeface.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkColor.h

@@ -12,7 +12,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkColor.h>
+#include "SkColor.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkColorFilter.h

@@ -8,7 +8,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkColorFilter.h>
+#include "SkColorFilter.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkColorFilterFactory.h

@@ -10,8 +10,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkColorFilter.h>
-#include <SkLumaColorFilter.h>
+#include "SkColorFilter.h"
+#include "SkLumaColorFilter.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkContourMeasure.h

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkContourMeasure.h>
+#include "SkContourMeasure.h"
 
 #include "JsiSkPath.h"
 

package/cpp/api/JsiSkContourMeasureIter.h

@@ -9,7 +9,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkContourMeasure.h>
+#include "SkContourMeasure.h"
 
 #include "JsiSkPath.h"
 
@@ -80,4 +80,4 @@ public:
     };
   }
 };
-} // namespace RNSkia
+} // namespace RNSkia

package/cpp/api/JsiSkData.h

@@ -10,8 +10,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkFont.h>
-#include <SkStream.h>
+#include "SkFont.h"
+#include "SkStream.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkDataFactory.h

@@ -6,7 +6,7 @@
 #include <ReactCommon/TurboModuleUtils.h>
 #include <jsi/jsi.h>
 
-#include <SkBase64.h>
+#include "SkBase64.h"
 
 #include "JsiSkData.h"
 

package/cpp/api/JsiSkFont.h

@@ -17,8 +17,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkFont.h>
-#include <SkFontMetrics.h>
+#include "SkFont.h"
+#include "SkFontMetrics.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkImage.h

@@ -11,9 +11,9 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkBase64.h>
-#include <SkImage.h>
-#include <SkStream.h>
+#include "SkBase64.h"
+#include "SkImage.h"
+#include "SkStream.h"
 #include <include/codec/SkCodec.h>
 
 #pragma clang diagnostic pop

package/cpp/api/JsiSkImageFilter.h

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkImageFilters.h>
+#include "SkImageFilters.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkImageFilterFactory.h

@@ -12,7 +12,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkImageFilter.h>
+#include "SkImageFilter.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkImageInfo.h

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkImageInfo.h>
+#include "SkImageInfo.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkMaskFilter.h

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkMaskFilter.h>
+#include "SkMaskFilter.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkMaskFilterFactory.h

@@ -11,7 +11,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkMaskFilter.h>
+#include "SkMaskFilter.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkMatrix.h

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkMatrix.h>
+#include "SkMatrix.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkPaint.h

@@ -16,7 +16,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkPaint.h>
+#include "SkPaint.h"
 
 #pragma clang diagnostic pop
 
@@ -63,6 +63,11 @@ public:
     return static_cast<double>(getObject()->getStrokeWidth());
   }
 
+  JSI_HOST_FUNCTION(getAlphaf) {
+    float alphaf = getObject()->getAlphaf();
+    return jsi::Value(SkScalarToDouble(alphaf));
+  }
+
   JSI_HOST_FUNCTION(setColor) {
     SkColor color = JsiSkColor::fromValue(runtime, arguments[0]);
     getObject()->setColor(color);
@@ -159,6 +164,7 @@ public:
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPaint, copy),
                        JSI_EXPORT_FUNC(JsiSkPaint, reset),
+                       JSI_EXPORT_FUNC(JsiSkPaint, getAlphaf),
                        JSI_EXPORT_FUNC(JsiSkPaint, getColor),
                        JSI_EXPORT_FUNC(JsiSkPaint, getStrokeCap),
                        JSI_EXPORT_FUNC(JsiSkPaint, getStrokeJoin),

package/cpp/api/JsiSkPath.h

@@ -14,16 +14,16 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkDashPathEffect.h>
-#include <SkParsePath.h>
-#include <SkPath.h>
-#include <SkPathEffect.h>
-#include <SkPathOps.h>
-#include <SkPathTypes.h>
-#include <SkString.h>
-#include <SkStrokeRec.h>
-#include <SkTextUtils.h>
-#include <SkTrimPathEffect.h>
+#include "SkDashPathEffect.h"
+#include "SkParsePath.h"
+#include "SkPath.h"
+#include "SkPathEffect.h"
+#include "SkPathOps.h"
+#include "SkPathTypes.h"
+#include "SkString.h"
+#include "SkStrokeRec.h"
+#include "SkTextUtils.h"
+#include "SkTrimPathEffect.h"
 
 #include "JsiSkMatrix.h"
 
@@ -42,7 +42,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(addArc) {
-    auto rect = JsiSkRect::fromValue(runtime, arguments[0]).get();
+    auto rect = JsiSkRect::fromValue(runtime, arguments[0]);
     auto start = arguments[1].asNumber();
     auto sweep = arguments[2].asNumber();
     getObject()->addArc(*rect, start, sweep);
@@ -50,7 +50,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(addOval) {
-    auto rect = JsiSkRect::fromValue(runtime, arguments[0]).get();
+    auto rect = JsiSkRect::fromValue(runtime, arguments[0]);
     auto direction = SkPathDirection::kCW;
     if (count >= 2 && arguments[1].getBool()) {
       direction = SkPathDirection::kCCW;
@@ -76,7 +76,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(addRect) {
-    auto rect = JsiSkRect::fromValue(runtime, arguments[0]).get();
+    auto rect = JsiSkRect::fromValue(runtime, arguments[0]);
     auto direction = SkPathDirection::kCW;
     if (count >= 2 && arguments[1].getBool()) {
       direction = SkPathDirection::kCCW;
@@ -86,7 +86,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(addRRect) {
-    auto rrect = JsiSkRRect::fromValue(runtime, arguments[0]).get();
+    auto rrect = JsiSkRRect::fromValue(runtime, arguments[0]);
     auto direction = SkPathDirection::kCW;
     if (count >= 2 && arguments[1].getBool()) {
       direction = SkPathDirection::kCCW;
@@ -96,7 +96,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(arcToOval) {
-    auto rect = JsiSkRect::fromValue(runtime, arguments[0]).get();
+    auto rect = JsiSkRect::fromValue(runtime, arguments[0]);
     auto start = arguments[1].asNumber();
     auto sweep = arguments[2].asNumber();
     auto forceMoveTo = arguments[3].getBool();

package/cpp/api/JsiSkPathEffect.h

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkPathEffect.h>
+#include "SkPathEffect.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkPathEffectFactory.h

@@ -12,12 +12,12 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#include "SkCornerPathEffect.h"
+#include "SkDashPathEffect.h"
+#include "SkDiscretePathEffect.h"
+#include "SkPathEffect.h"
 #include "include/effects/Sk1DPathEffect.h"
 #include "include/effects/Sk2DPathEffect.h"
-#include <SkCornerPathEffect.h>
-#include <SkDashPathEffect.h>
-#include <SkDiscretePathEffect.h>
-#include <SkPathEffect.h>
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkPathFactory.h

@@ -11,9 +11,9 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#include "SkPath.h"
+#include "SkPathOps.h"
 #include <RNSkLog.h>
-#include <SkPath.h>
-#include <SkPathOps.h>
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkPicture.h

@@ -9,7 +9,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkPicture.h>
+#include "SkPicture.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkPictureFactory.h

@@ -10,8 +10,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkData.h>
-#include <SkPicture.h>
+#include "SkData.h"
+#include "SkPicture.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkPictureRecorder.h

@@ -10,8 +10,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkBBHFactory.h>
-#include <SkPictureRecorder.h>
+#include "SkBBHFactory.h"
+#include "SkPictureRecorder.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkPoint.h

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkPoint.h>
+#include "SkPoint.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkRRect.h

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkRRect.h>
+#include "SkRRect.h"
 
 #include "JsiSkRect.h"
 

package/cpp/api/JsiSkRSXform.h

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkRSXform.h>
+#include "SkRSXform.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkRect.h

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkRect.h>
+#include "SkRect.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkRuntimeEffect.h

@@ -14,7 +14,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkRuntimeEffect.h>
+#include "SkRuntimeEffect.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkRuntimeShaderBuilder.h

@@ -12,7 +12,7 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 
 #include "JsiSkRuntimeEffect.h"
-#include <SkRuntimeEffect.h>
+#include "SkRuntimeEffect.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkSVGFactory.h

@@ -13,7 +13,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkStream.h>
+#include "SkStream.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkShader.h

@@ -10,8 +10,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkGradientShader.h>
-#include <SkShader.h>
+#include "SkGradientShader.h"
+#include "SkShader.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkShaderFactory.h

@@ -12,9 +12,9 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkColorFilter.h>
-#include <SkImageFilters.h>
-#include <SkPerlinNoiseShader.h>
+#include "SkColorFilter.h"
+#include "SkImageFilters.h"
+#include "SkPerlinNoiseShader.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkSurface.h

@@ -14,7 +14,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkSurface.h>
+#include "SkSurface.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkSurfaceFactory.h

@@ -12,8 +12,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkImage.h>
-#include <SkSurface.h>
+#include "SkImage.h"
+#include "SkSurface.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkTextBlob.h

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkTextBlob.h>
+#include "SkTextBlob.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkTextBlobFactory.h

@@ -14,7 +14,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkTextBlob.h>
+#include "SkTextBlob.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkTypeface.h

@@ -11,8 +11,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkFont.h>
-#include <SkTypeface.h>
+#include "SkFont.h"
+#include "SkTypeface.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkVertices.h

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkVertices.h>
+#include "SkVertices.h"
 
 #pragma clang diagnostic pop
 

package/cpp/jsi/JsiHostObject.h

@@ -132,31 +132,6 @@ public:
   JsiHostObject();
   ~JsiHostObject();
 
-protected:
-  /**
-   Override to return map of name/functions
-   */
-  virtual const RNJsi::JsiFunctionMap &getExportedFunctionMap() {
-    static const RNJsi::JsiFunctionMap empty;
-    return empty;
-  }
-
-  /**
-   Override to get property getters map of name/functions
-   */
-  virtual const JsiPropertyGettersMap &getExportedPropertyGettersMap() {
-    static const JsiPropertyGettersMap empty;
-    return empty;
-  }
-
-  /**
-   Override to get property setters map of name/functions
-   */
-  virtual const JsiPropertySettersMap &getExportedPropertySettersMap() {
-    static const JsiPropertySettersMap empty;
-    return empty;
-  }
-
   /**
    * Overridden jsi::HostObject set property method
    * @param rt Runtime
@@ -183,6 +158,31 @@ protected:
    */
   std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &runtime) override;
 
+protected:
+  /**
+   Override to return map of name/functions
+   */
+  virtual const RNJsi::JsiFunctionMap &getExportedFunctionMap() {
+    static const RNJsi::JsiFunctionMap empty;
+    return empty;
+  }
+
+  /**
+   Override to get property getters map of name/functions
+   */
+  virtual const JsiPropertyGettersMap &getExportedPropertyGettersMap() {
+    static const JsiPropertyGettersMap empty;
+    return empty;
+  }
+
+  /**
+   Override to get property setters map of name/functions
+   */
+  virtual const JsiPropertySettersMap &getExportedPropertySettersMap() {
+    static const JsiPropertySettersMap empty;
+    return empty;
+  }
+
   /**
    * Installs a function into the function map
    */