@shopify/react-native-skia 1.3.12 → 1.4.0

package/cpp/skia/modules/svg/include/SkSVGLine.h

@@ -8,9 +8,20 @@
 #ifndef SkSVGLine_DEFINED
 #define SkSVGLine_DEFINED
 
+#include "include/core/SkPath.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGShape.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <tuple>
+
+class SkCanvas;
+class SkPaint;
+class SkSVGLengthContext;
+class SkSVGRenderContext;
+enum class SkPathFillType;
 struct SkPoint;
 
 class SK_API SkSVGLine final : public SkSVGShape {

package/cpp/skia/modules/svg/include/SkSVGLinearGradient.h

@@ -8,9 +8,19 @@
 #ifndef SkSVGLinearGradient_DEFINED
 #define SkSVGLinearGradient_DEFINED
 
+#include "include/core/SkColor.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGGradient.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+class SkMatrix;
+class SkSVGRenderContext;
+class SkShader;
+enum class SkTileMode;
+
 class SK_API SkSVGLinearGradient final : public SkSVGGradient {
 public:
     static sk_sp<SkSVGLinearGradient> Make() {

package/cpp/skia/modules/svg/include/SkSVGMask.h

@@ -8,9 +8,15 @@
 #ifndef SkSVGMask_DEFINED
 #define SkSVGMask_DEFINED
 
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGHiddenContainer.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+class SkSVGRenderContext;
+
 class SK_API SkSVGMask final : public SkSVGHiddenContainer {
 public:
     static sk_sp<SkSVGMask> Make() {

package/cpp/skia/modules/svg/include/SkSVGNode.h

@@ -8,15 +8,19 @@
 #ifndef SkSVGNode_DEFINED
 #define SkSVGNode_DEFINED
 
+#include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGAttribute.h"
 #include "modules/svg/include/SkSVGAttributeParser.h"
+#include "modules/svg/include/SkSVGTypes.h"
+
+#include <utility>
 
-class SkCanvas;
 class SkMatrix;
 class SkPaint;
 class SkPath;
-class SkSVGLengthContext;
+class SkSVGNode;
 class SkSVGRenderContext;
 class SkSVGValue;
 
@@ -27,13 +31,20 @@ enum class SkSVGTag {
     kEllipse,
     kFeBlend,
     kFeColorMatrix,
+    kFeComponentTransfer,
     kFeComposite,
     kFeDiffuseLighting,
     kFeDisplacementMap,
     kFeDistantLight,
     kFeFlood,
+    kFeFuncA,
+    kFeFuncR,
+    kFeFuncG,
+    kFeFuncB,
     kFeGaussianBlur,
     kFeImage,
+    kFeMerge,
+    kFeMergeNode,
     kFeMorphology,
     kFeOffset,
     kFePointLight,

package/cpp/skia/modules/svg/include/SkSVGOpenTypeSVGDecoder.h

@@ -10,9 +10,14 @@
 
 #include "include/core/SkColor.h"
 #include "include/core/SkOpenTypeSVGDecoder.h"
+#include "include/core/SkRefCnt.h"
 #include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
 
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+
 class SkCanvas;
 class SkSVGDOM;
 

package/cpp/skia/modules/svg/include/SkSVGPath.h

@@ -9,8 +9,18 @@
 #define SkSVGPath_DEFINED
 
 #include "include/core/SkPath.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGShape.h"
 
+class SkCanvas;
+class SkPaint;
+class SkSVGLengthContext;
+class SkSVGRenderContext;
+enum class SkPathFillType;
+
 class SK_API SkSVGPath final : public SkSVGShape {
 public:
     static sk_sp<SkSVGPath> Make() { return sk_sp<SkSVGPath>(new SkSVGPath()); }

package/cpp/skia/modules/svg/include/SkSVGPattern.h

@@ -8,9 +8,14 @@
 #ifndef SkSVGPattern_DEFINED
 #define SkSVGPattern_DEFINED
 
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGHiddenContainer.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
+#include "src/base/SkTLazy.h"
 
+class SkPaint;
 class SkSVGRenderContext;
 
 class SK_API SkSVGPattern final : public SkSVGHiddenContainer {

package/cpp/skia/modules/svg/include/SkSVGPoly.h

@@ -9,7 +9,18 @@
 #define SkSVGPoly_DEFINED
 
 #include "include/core/SkPath.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGShape.h"
+#include "modules/svg/include/SkSVGTypes.h"
+
+class SkCanvas;
+class SkPaint;
+class SkSVGLengthContext;
+class SkSVGRenderContext;
+enum class SkPathFillType;
 
 // Handles <polygon> and <polyline> elements.
 class SK_API SkSVGPoly final : public SkSVGShape {

package/cpp/skia/modules/svg/include/SkSVGRadialGradient.h

@@ -8,8 +8,19 @@
 #ifndef SkSVGRadialGradient_DEFINED
 #define SkSVGRadialGradient_DEFINED
 
+#include "include/core/SkColor.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGGradient.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
+#include "src/base/SkTLazy.h"
+
+class SkMatrix;
+class SkSVGRenderContext;
+class SkShader;
+enum class SkTileMode;
 
 class SK_API SkSVGRadialGradient final : public SkSVGGradient {
 public:

package/cpp/skia/modules/svg/include/SkSVGRect.h

@@ -8,10 +8,21 @@
 #ifndef SkSVGRect_DEFINED
 #define SkSVGRect_DEFINED
 
+#include "include/core/SkPath.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGShape.h"
 #include "modules/svg/include/SkSVGTypes.h"
+#include "src/base/SkTLazy.h"
 
+class SkCanvas;
+class SkPaint;
 class SkRRect;
+class SkSVGLengthContext;
+class SkSVGRenderContext;
+enum class SkPathFillType;
 
 class SK_API SkSVGRect final : public SkSVGShape {
 public:

package/cpp/skia/modules/svg/include/SkSVGRenderContext.h

@@ -9,20 +9,32 @@
 #define SkSVGRenderContext_DEFINED
 
 #include "include/core/SkFontMgr.h"
+#include "include/core/SkFourByteTag.h"
 #include "include/core/SkM44.h"
-#include "include/core/SkPaint.h"
 #include "include/core/SkPath.h"
 #include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
 #include "include/core/SkSize.h"
 #include "include/core/SkTypes.h"
-#include "modules/skresources/include/SkResources.h"
+#include "modules/skshaper/include/SkShaper.h"
+#include "modules/skshaper/include/SkShaper_factory.h"
 #include "modules/svg/include/SkSVGAttribute.h"
 #include "modules/svg/include/SkSVGIDMapper.h"
+#include "modules/svg/include/SkSVGNode.h"
+#include "modules/svg/include/SkSVGTypes.h"
 #include "src/base/SkTLazy.h"
 #include "src/core/SkTHash.h"
 
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <utility>
+
 class SkCanvas;
-class SkSVGLength;
+class SkPaint;
+class SkString;
+namespace skresources { class ResourceProvider; }
 
 class SK_API SkSVGLengthContext {
 public:
@@ -66,10 +78,14 @@ public:
         const SkSVGRenderContext* fCtx;
     };
 
-    SkSVGRenderContext(SkCanvas*, const sk_sp<SkFontMgr>&,
-                       const sk_sp<skresources::ResourceProvider>&, const SkSVGIDMapper&,
-                       const SkSVGLengthContext&, const SkSVGPresentationContext&,
-                       const OBBScope&);
+    SkSVGRenderContext(SkCanvas*,
+                       const sk_sp<SkFontMgr>&,
+                       const sk_sp<skresources::ResourceProvider>&,
+                       const SkSVGIDMapper&,
+                       const SkSVGLengthContext&,
+                       const SkSVGPresentationContext&,
+                       const OBBScope&,
+                       const sk_sp<SkShapers::Factory>&);
     SkSVGRenderContext(const SkSVGRenderContext&);
     SkSVGRenderContext(const SkSVGRenderContext&, SkCanvas*);
     // Establish a new OBB scope.  Normally used when entering a node's render scope.
@@ -155,6 +171,25 @@ public:
                           const SkSVGLength& w, const SkSVGLength& h,
                           SkSVGObjectBoundingBoxUnits) const;
 
+    std::unique_ptr<SkShaper> makeShaper() const {
+        SkASSERT(fTextShapingFactory);
+        return fTextShapingFactory->makeShaper(this->fontMgr());
+    }
+
+    std::unique_ptr<SkShaper::BiDiRunIterator> makeBidiRunIterator(const char* utf8,
+                                                                   size_t utf8Bytes,
+                                                                   uint8_t bidiLevel) const {
+        SkASSERT(fTextShapingFactory);
+        return fTextShapingFactory->makeBidiRunIterator(utf8, utf8Bytes, bidiLevel);
+    }
+
+    std::unique_ptr<SkShaper::ScriptRunIterator> makeScriptRunIterator(const char* utf8,
+                                                                       size_t utf8Bytes) const {
+        SkASSERT(fTextShapingFactory);
+        constexpr SkFourByteTag unknownScript = SkSetFourByteTag('Z', 'z', 'z', 'z');
+        return fTextShapingFactory->makeScriptRunIterator(utf8, utf8Bytes, unknownScript);
+    }
+
 private:
     // Stack-only
     void* operator new(size_t)                               = delete;
@@ -169,6 +204,7 @@ private:
     SkTLazy<SkPaint> commonPaint(const SkSVGPaint&, float opacity) const;
 
     const sk_sp<SkFontMgr>&                       fFontMgr;
+    const sk_sp<SkShapers::Factory>&              fTextShapingFactory;
     const sk_sp<skresources::ResourceProvider>&   fResourceProvider;
     const SkSVGIDMapper&                          fIDMapper;
     SkTCopyOnFirstWrite<SkSVGLengthContext>       fLengthContext;

package/cpp/skia/modules/svg/include/SkSVGSVG.h

@@ -8,11 +8,18 @@
 #ifndef SkSVGSVG_DEFINED
 #define SkSVGSVG_DEFINED
 
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkSize.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGContainer.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
+#include "modules/svg/include/SkSVGValue.h"
 #include "src/base/SkTLazy.h"
 
 class SkSVGLengthContext;
+class SkSVGRenderContext;
+enum class SkSVGAttribute;
 
 class SK_API SkSVGSVG : public SkSVGContainer {
 public:

package/cpp/skia/modules/svg/include/SkSVGShape.h

@@ -8,11 +8,17 @@
 #ifndef SkSVGShape_DEFINED
 #define SkSVGShape_DEFINED
 
-#include "include/core/SkPath.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGTransformableNode.h"
 
-class SkSVGLengthContext;
+class SkCanvas;
 class SkPaint;
+class SkSVGLengthContext;
+class SkSVGNode;
+class SkSVGRenderContext;
+enum class SkPathFillType;
+enum class SkSVGTag;
 
 class SK_API SkSVGShape : public SkSVGTransformableNode {
 public:

package/cpp/skia/modules/svg/include/SkSVGStop.h

@@ -8,18 +8,20 @@
 #ifndef SkSVGStop_DEFINED
 #define SkSVGStop_DEFINED
 
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGHiddenContainer.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
-class SkSVGLengthContext;
-
 class SK_API SkSVGStop : public SkSVGHiddenContainer {
 public:
+    static constexpr SkSVGTag tag = SkSVGTag::kStop;
+
     static sk_sp<SkSVGStop> Make() {
         return sk_sp<SkSVGStop>(new SkSVGStop());
     }
 
-
     SVG_ATTR(Offset, SkSVGLength, SkSVGLength(0, SkSVGLength::Unit::kPercentage))
 
 protected:

package/cpp/skia/modules/svg/include/SkSVGText.h

@@ -8,11 +8,17 @@
 #ifndef SkSVGText_DEFINED
 #define SkSVGText_DEFINED
 
-#include <vector>
-
+#include "include/core/SkPath.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTransformableNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <vector>
+
+class SkSVGRenderContext;
 class SK_API SkSVGTextContext;
 
 // Base class for text-rendering nodes.

package/cpp/skia/modules/svg/include/SkSVGTransformableNode.h

@@ -9,7 +9,15 @@
 #define SkSVGTransformableNode_DEFINED
 
 #include "include/core/SkMatrix.h"
+#include "include/core/SkPath.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGNode.h"
+#include "modules/svg/include/SkSVGTypes.h"
+#include "modules/svg/include/SkSVGValue.h"
+
+class SkSVGRenderContext;
+enum class SkSVGAttribute;
+struct SkRect;
 
 class SK_API SkSVGTransformableNode : public SkSVGNode {
 public:

package/cpp/skia/modules/svg/include/SkSVGTypes.h

@@ -728,4 +728,13 @@ enum class SkSVGDisplay {
     kNone,
 };
 
+// https://www.w3.org/TR/SVG11/filters.html#TransferFunctionElementAttributes
+enum class SkSVGFeFuncType {
+    kIdentity,
+    kTable,
+    kDiscrete,
+    kLinear,
+    kGamma,
+};
+
 #endif // SkSVGTypes_DEFINED

package/cpp/skia/modules/svg/include/SkSVGUse.h

@@ -8,9 +8,16 @@
 #ifndef SkSVGUse_DEFINED
 #define SkSVGUse_DEFINED
 
+#include "include/core/SkPath.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTransformableNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+class SkSVGRenderContext;
+
 /**
  * Implements support for <use> (reference) elements.
  * (https://www.w3.org/TR/SVG11/struct.html#UseElement)