@shopify/react-native-skia 2.0.0-next.1 → 2.0.0-next.2

package/cpp/api/JsiSkHostObjects.h

@@ -54,20 +54,21 @@ public:
 
   /**
    * Returns the underlying object exposed by this host object. This object
-   * should be wrapped in a shared pointer of some kind
+   * should be wrapped in a shared pointer of some kind.
+   * Throws if the object has been disposed.
    * @return Underlying object
    */
-  T getObject() { return _object; }
-  const T getObject() const { return _object; }
+  T getObject() { return validateObject(); }
+  const T getObject() const { return validateObject(); }
 
   /**
-   Updates the inner object with a new version of the object.
+   * Updates the inner object with a new version of the object.
    */
   void setObject(T object) { _object = object; }
 
   /**
-   Dispose function that can be exposed to JS by using the JSI_API_TYPENAME
-   macro
+   * Dispose function that can be exposed to JS by using the JSI_API_TYPENAME
+   * macro.
    */
   JSI_HOST_FUNCTION(dispose) {
     safeDispose();
@@ -76,12 +77,22 @@ public:
 
 protected:
   /**
-   Override to implement disposale of allocated resources like smart pointers
-   etc. This method will only be called once for each instance of this class.
+   * Override to implement disposal of allocated resources like smart pointers.
+   * This method will only be called once for each instance of this class.
    */
   virtual void releaseResources() = 0;
 
 private:
+  /**
+   * Validates that _object was not disposed and returns it.
+   */
+  T validateObject() const {
+    if (_isDisposed) {
+      throw std::runtime_error("Attempted to access a disposed object.");
+    }
+    return _object;
+  }
+
   void safeDispose() {
     if (!_isDisposed) {
       _isDisposed = true;
@@ -90,12 +101,12 @@ private:
   }
 
   /**
-   * Wrapped object
+   * Wrapped object.
    */
   T _object;
 
   /**
-   Resource disposed flag
+   * Resource disposed flag.
    */
   std::atomic<bool> _isDisposed = {false};
 };

package/cpp/api/JsiSkParagraph.h

@@ -24,19 +24,19 @@
 namespace RNSkia {
 
 namespace jsi = facebook::jsi;
-
 namespace para = skia::textlayout;
 
 /**
- Implementation of the Paragraph object in JSI
+ * Implementation of the Paragraph object in JSI
  */
-class JsiSkParagraph : public JsiSkHostObject {
+class JsiSkParagraph
+    : public JsiSkWrappingSharedPtrHostObject<para::Paragraph> {
 public:
   EXPORT_JSI_API_TYPENAME(JsiSkParagraph, Paragraph)
 
   JSI_HOST_FUNCTION(layout) {
     auto width = getArgumentAsNumber(runtime, arguments, count, 0);
-    _paragraph->layout(width);
+    getObject()->layout(width);
     return jsi::Value::undefined();
   }
 
@@ -45,34 +45,34 @@ public:
         getArgumentAsHostObject<JsiSkCanvas>(runtime, arguments, count, 0);
     auto x = getArgumentAsNumber(runtime, arguments, count, 1);
     auto y = getArgumentAsNumber(runtime, arguments, count, 2);
-    _paragraph->paint(jsiCanvas->getCanvas(), x, y);
+    getObject()->paint(jsiCanvas->getCanvas(), x, y);
     return jsi::Value::undefined();
   }
 
   JSI_HOST_FUNCTION(getHeight) {
-    return static_cast<double>(_paragraph->getHeight());
+    return static_cast<double>(getObject()->getHeight());
   }
 
   JSI_HOST_FUNCTION(getMaxWidth) {
-    return static_cast<double>(_paragraph->getMaxWidth());
+    return static_cast<double>(getObject()->getMaxWidth());
   }
 
   JSI_HOST_FUNCTION(getMaxIntrinsicWidth) {
-    return static_cast<double>(_paragraph->getMaxIntrinsicWidth());
+    return static_cast<double>(getObject()->getMaxIntrinsicWidth());
   }
 
   JSI_HOST_FUNCTION(getMinIntrinsicWidth) {
-    return static_cast<double>(_paragraph->getMinIntrinsicWidth());
+    return static_cast<double>(getObject()->getMinIntrinsicWidth());
   }
 
   JSI_HOST_FUNCTION(getLongestLine) {
-    return static_cast<double>(_paragraph->getLongestLine());
+    return static_cast<double>(getObject()->getLongestLine());
   }
 
   JSI_HOST_FUNCTION(getGlyphPositionAtCoordinate) {
     auto dx = getArgumentAsNumber(runtime, arguments, count, 0);
     auto dy = getArgumentAsNumber(runtime, arguments, count, 1);
-    auto result = _paragraph->getGlyphPositionAtCoordinate(dx, dy);
+    auto result = getObject()->getGlyphPositionAtCoordinate(dx, dy);
     return result.position;
   }
 
@@ -80,8 +80,8 @@ public:
     auto start = getArgumentAsNumber(runtime, arguments, count, 0);
     auto end = getArgumentAsNumber(runtime, arguments, count, 1);
     auto result =
-        _paragraph->getRectsForRange(start, end, para::RectHeightStyle::kTight,
-                                     para::RectWidthStyle::kTight);
+        getObject()->getRectsForRange(start, end, para::RectHeightStyle::kTight,
+                                      para::RectWidthStyle::kTight);
     auto returnValue = jsi::Array(runtime, result.size());
     for (size_t i = 0; i < result.size(); ++i) {
       returnValue.setValueAtIndex(
@@ -93,7 +93,7 @@ public:
 
   JSI_HOST_FUNCTION(getLineMetrics) {
     std::vector<para::LineMetrics> metrics;
-    _paragraph->getLineMetrics(metrics);
+    getObject()->getLineMetrics(metrics);
     auto returnValue = jsi::Array(runtime, metrics.size());
     auto height = 0;
     for (size_t i = 0; i < metrics.size(); ++i) {
@@ -110,7 +110,7 @@ public:
 
   JSI_HOST_FUNCTION(getRectsForPlaceholders) {
     std::vector<para::TextBox> placeholderInfos =
-        _paragraph->getRectsForPlaceholders();
+        getObject()->getRectsForPlaceholders();
     auto returnValue = jsi::Array(runtime, placeholderInfos.size());
     for (size_t i = 0; i < placeholderInfos.size(); ++i) {
       auto obj = jsi::Object(runtime);
@@ -124,12 +124,6 @@ public:
     return returnValue;
   }
 
-  JSI_HOST_FUNCTION(dispose) {
-    _paragraph = nullptr;
-
-    return jsi::Value::undefined();
-  }
-
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkParagraph, layout),
                        JSI_EXPORT_FUNC(JsiSkParagraph, paint),
                        JSI_EXPORT_FUNC(JsiSkParagraph, getMaxWidth),
@@ -146,12 +140,8 @@ public:
 
   explicit JsiSkParagraph(std::shared_ptr<RNSkPlatformContext> context,
                           para::ParagraphBuilder *paragraphBuilder)
-      : JsiSkHostObject(std::move(context)) {
-    _paragraph = paragraphBuilder->Build();
-  }
-
-public:
-  std::unique_ptr<para::Paragraph> _paragraph;
+      : JsiSkWrappingSharedPtrHostObject<para::Paragraph>(
+            std::move(context), std::move(paragraphBuilder->Build())) {}
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkPathEffect.h

@@ -26,7 +26,7 @@ public:
                                                    std::move(pathEffect)) {}
 
   EXPORT_JSI_API_TYPENAME(JsiSkPathEffect, PathEffect)
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkColorFilter, dispose))
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPathEffect, dispose))
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkPictureFactory.h

@@ -45,7 +45,7 @@ public:
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPictureFactory, MakePicture))
 
   explicit JsiSkPictureFactory(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiSkHostObject(context) {}
+      : JsiSkHostObject(std::move(context)) {}
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkShaderFactory.h

@@ -84,14 +84,22 @@ public:
     SkPoint pts[] = {p1, p2};
 
     std::vector<SkColor> colors = getColors(runtime, arguments[2]);
+    auto colorsSize = colors.size();
+    if (colorsSize < 2) {
+      throw std::invalid_argument("colors must have at least 2 colors");
+    }
     std::vector<SkScalar> positions = getPositions(runtime, arguments[3]);
+    if (!positions.empty() && positions.size() != colorsSize) {
+      throw std::invalid_argument(
+          "positions must be empty or have the same size as colors");
+    }
     auto tileMode = getTileMode(arguments, 4, count);
     auto flag = getFlag(arguments, 6, count);
     auto localMatrix = getLocalMatrix(runtime, arguments, 5, count);
 
     sk_sp<SkShader> gradient = SkGradientShader::MakeLinear(
-        pts, colors.data(), positions.data(), static_cast<int>(colors.size()),
-        tileMode, flag, localMatrix);
+        pts, colors.data(), !positions.empty() ? positions.data() : nullptr,
+        static_cast<int>(colorsSize), tileMode, flag, localMatrix);
     return jsi::Object::createFromHostObject(
         runtime,
         std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
@@ -103,14 +111,23 @@ public:
     auto r = arguments[1].asNumber();
 
     std::vector<SkColor> colors = getColors(runtime, arguments[2]);
+    auto colorsSize = colors.size();
+    if (colorsSize < 2) {
+      throw std::invalid_argument("colors must have at least 2 colors");
+    }
     std::vector<SkScalar> positions = getPositions(runtime, arguments[3]);
+    if (!positions.empty() && positions.size() != colorsSize) {
+      throw std::invalid_argument(
+          "positions must be empty or the same size as colors");
+    }
     auto tileMode = getTileMode(arguments, 4, count);
     auto flag = getFlag(arguments, 6, count);
     auto localMatrix = getLocalMatrix(runtime, arguments, 5, count);
 
     sk_sp<SkShader> gradient = SkGradientShader::MakeRadial(
-        center, r, colors.data(), positions.data(),
-        static_cast<int>(colors.size()), tileMode, flag, localMatrix);
+        center, r, colors.data(),
+        !positions.empty() ? positions.data() : nullptr,
+        static_cast<int>(colorsSize), tileMode, flag, localMatrix);
     return jsi::Object::createFromHostObject(
         runtime,
         std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
@@ -120,7 +137,15 @@ public:
     auto x = arguments[0].asNumber();
     auto y = arguments[1].asNumber();
     std::vector<SkColor> colors = getColors(runtime, arguments[2]);
+    auto colorsSize = colors.size();
+    if (colorsSize < 2) {
+      throw std::invalid_argument("colors must have at least 2 colors");
+    }
     std::vector<SkScalar> positions = getPositions(runtime, arguments[3]);
+    if (!positions.empty() && positions.size() != colorsSize) {
+      throw std::invalid_argument(
+          "positions must be empty or the same size as colors");
+    }
     auto tileMode = getTileMode(arguments, 4, count);
     auto localMatrix = getLocalMatrix(runtime, arguments, 5, count);
     auto flag = getFlag(arguments, 6, count);
@@ -130,8 +155,9 @@ public:
                         ? 360
                         : arguments[8].asNumber();
     sk_sp<SkShader> gradient = SkGradientShader::MakeSweep(
-        x, y, colors.data(), positions.data(), static_cast<int>(colors.size()),
-        tileMode, startAngle, endAngle, flag, localMatrix);
+        x, y, colors.data(), !positions.empty() ? positions.data() : nullptr,
+        static_cast<int>(colorsSize), tileMode, startAngle, endAngle, flag,
+        localMatrix);
     return jsi::Object::createFromHostObject(
         runtime,
         std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
@@ -147,14 +173,23 @@ public:
     auto endRadius = arguments[3].asNumber();
 
     std::vector<SkColor> colors = getColors(runtime, arguments[4]);
+    auto colorsSize = colors.size();
+    if (colorsSize < 2) {
+      throw std::invalid_argument("colors must have at least 2 colors");
+    }
     std::vector<SkScalar> positions = getPositions(runtime, arguments[5]);
+    if (!positions.empty() && positions.size() != colorsSize) {
+      throw std::invalid_argument(
+          "positions must be empty or the same size as colors");
+    }
     auto tileMode = getTileMode(arguments, 6, count);
     auto localMatrix = getLocalMatrix(runtime, arguments, 7, count);
     auto flag = getFlag(arguments, 8, count);
 
     sk_sp<SkShader> gradient = SkGradientShader::MakeTwoPointConical(
-        start, startRadius, end, endRadius, colors.data(), positions.data(),
-        static_cast<int>(colors.size()), tileMode, flag, localMatrix);
+        start, startRadius, end, endRadius, colors.data(),
+        !positions.empty() ? positions.data() : nullptr,
+        static_cast<int>(colorsSize), tileMode, flag, localMatrix);
 
     return jsi::Object::createFromHostObject(
         runtime,

package/cpp/api/JsiSkVertices.h

@@ -70,6 +70,10 @@ public:
       if (count >= 3 && !arguments[2].isNull() && !arguments[2].isUndefined()) {
         auto jsiTexs = arguments[2].asObject(runtime).asArray(runtime);
         auto texsSize = jsiTexs.size(runtime);
+        if (texsSize != positionsSize) {
+          throw jsi::JSError(runtime, "The number of texture coordinates must "
+                                      "match the number of positions");
+        }
         texs.reserve(texsSize);
         for (int i = 0; i < texsSize; i++) {
           auto point = JsiSkPoint::fromValue(
@@ -81,6 +85,11 @@ public:
       if (count >= 4 && !arguments[3].isNull() && !arguments[3].isUndefined()) {
         auto jsiColors = arguments[3].asObject(runtime).asArray(runtime);
         auto colorsSize = jsiColors.size(runtime);
+        if (colorsSize != positionsSize) {
+          throw jsi::JSError(
+              runtime,
+              "The number of colors must match the number of positions");
+        }
         colors.reserve(colorsSize);
         for (int i = 0; i < colorsSize; i++) {
           SkColor color = JsiSkColor::fromValue(
@@ -132,9 +141,11 @@ public:
       //                    builder.indices());
       //                }
       //                auto vertices = builder.detach();
-      auto vertices = SkVertices::MakeCopy(
-          mode, positionsSize, positions.data(), texs.data(), colors.data(),
-          indicesSize, indices.data());
+      auto vertices =
+          SkVertices::MakeCopy(mode, positionsSize, positions.data(),
+                               texs.size() > 0 ? texs.data() : nullptr,
+                               colors.size() > 0 ? colors.data() : nullptr,
+                               indicesSize, indices.data());
       return jsi::Object::createFromHostObject(
           runtime,
           std::make_shared<JsiSkVertices>(context, std::move(vertices)));

package/cpp/api/recorder/Drawings.h

@@ -874,9 +874,10 @@ public:
   }
 
   void draw(DrawingCtx *ctx) {
-    if (props.paragraph && props.paragraph->_paragraph) {
-      props.paragraph->_paragraph->layout(props.width);
-      props.paragraph->_paragraph->paint(ctx->canvas, props.x, props.y);
+    if (props.paragraph) {
+      auto paragraph = props.paragraph->getObject();
+      paragraph->layout(props.width);
+      paragraph->paint(ctx->canvas, props.x, props.y);
     }
   }
 };

package/cpp/rnskia/DawnContext.h

@@ -51,7 +51,7 @@ async_callback(void *c,
 class DawnContext {
 public:
   // TODO: remove
-  friend class RNSkiOSPlatformContext;
+  friend class RNSkApplePlatformContext;
 
   DawnContext(const DawnContext &) = delete;
   DawnContext &operator=(const DawnContext &) = delete;

package/cpp/skia/include/codec/SkCodec.h

@@ -412,6 +412,9 @@ public:
      *  If a scanline decode is in progress, scanline mode will end, requiring the client to call
      *  startScanlineDecode() in order to return to decoding scanlines.
      *
+     *  For certain codecs, reading into a smaller bitmap than the original dimensions may not
+     *  produce correct results (e.g. animated webp).
+     *
      *  @return Result kSuccess, or another value explaining the type of failure.
      */
     Result getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options*);
@@ -812,6 +815,7 @@ protected:
     }
 
     virtual bool onGetGainmapCodec(SkGainmapInfo*, std::unique_ptr<SkCodec>*) { return false; }
+    virtual bool onGetGainmapInfo(SkGainmapInfo*) { return false; }
 
     // TODO(issues.skia.org/363544350): This API only works for JPEG images. Remove this API once
     // it is no longer used.
@@ -1053,8 +1057,9 @@ private:
     friend class PNGCodecGM;    // for fillIncompleteImage
     friend class SkSampledCodec;
     friend class SkIcoCodec;
-    friend class SkAndroidCodec; // for fEncodedInfo
-    friend class SkPDFBitmap; // for fEncodedInfo
+    friend class SkPngCodec;     // for onGetGainmapCodec
+    friend class SkAndroidCodec;  // for handleFrameIndex
+    friend class SkCodecPriv;     // for fEncodedInfo
 };
 
 namespace SkCodecs {

package/cpp/skia/include/config/SkUserConfig.h

@@ -74,6 +74,12 @@
 */
 //#define SK_R32_SHIFT    16
 
+/*  This controls how much space should be pre-allocated in an SkCanvas object
+    to store the SkMatrix and clip via calls to SkCanvas::save() (and balanced with
+    SkCanvas::restore()).
+*/
+//#define SK_CANVAS_SAVE_RESTORE_PREALLOC_COUNT 32
+
 /* Determines whether to build code that supports the Ganesh GPU backend. Some classes
    that are not GPU-specific, such as SkShader subclasses, have optional code
    that is used allows them to interact with this GPU backend. If you'd like to
@@ -95,6 +101,11 @@
 //#define SK_HISTOGRAM_MEMORY_KB(name, sample)
 //#define SK_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES(name, sampleUSec, minUSec, maxUSec, bucketCount)
 
+/*
+ * Skia can provide extensive logging of Graphite Pipeline lifetimes.
+ */
+//#define SK_PIPELINE_LIFETIME_LOGGING
+
 // To use smaller but slower mipmap builder
 //#define SK_USE_DRAWING_MIPMAP_DOWNSAMPLER
 

package/cpp/skia/include/core/SkCanvas.h

@@ -34,6 +34,7 @@
 #include "include/private/base/SkDeque.h"
 #include "include/private/base/SkTArray.h"
 
+#include <cstddef>
 #include <cstdint>
 #include <cstring>
 #include <memory>
@@ -2502,15 +2503,18 @@ private:
         void reset(SkDevice* device);
     };
 
-    // the first N recs that can fit here mean we won't call malloc
-    static constexpr int kMCRecSize      = 96; // most recent measurement
-    static constexpr int kMCRecCount     = 32; // common depth for save/restores
+#if defined(SK_CANVAS_SAVE_RESTORE_PREALLOC_COUNT)
+    static constexpr int kMCRecCount = SK_CANVAS_SAVE_RESTORE_PREALLOC_COUNT;
+#else
+    static constexpr int kMCRecCount = 32; // common depth for save/restores
+#endif
 
-    intptr_t fMCRecStorage[kMCRecSize * kMCRecCount / sizeof(intptr_t)];
+    // This stack allocation of memory will be used to house the first kMCRecCount
+    // layers without need to call malloc.
+    alignas(MCRec) std::byte fMCRecStorage[sizeof(MCRec) * kMCRecCount];
 
-    SkDeque     fMCStack;
-    // points to top of stack
-    MCRec*      fMCRec;
+    SkDeque     fMCStack; // uses the stack memory
+    MCRec*      fMCRec;   // points to top of stack for convenience
 
     // Installed via init()
     sk_sp<SkDevice> fRootDevice;

package/cpp/skia/include/core/SkColor.h

@@ -12,6 +12,7 @@
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
 #include "include/private/base/SkCPUTypes.h"
+#include "include/private/base/SkTPin.h"
 
 #include <array>
 #include <cstdint>
@@ -415,6 +416,15 @@ struct SkRGBA4f {
     SkRGBA4f makeOpaque() const {
         return { fR, fG, fB, 1.0f };
     }
+
+    /**
+     Returns a copy of the SkRGBA4f but with the alpha component pinned to [0, 1].
+
+     @return          color with pinned alpha
+    */
+    SkRGBA4f pinAlpha() const {
+        return { fR, fG, fB, SkTPin(fA, 0.f, 1.f) };
+    }
 };
 
 /** \struct SkColor4f