@shopify/react-native-skia 1.3.13 → 1.4.0

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

@@ -8,9 +8,15 @@
 #ifndef SkSVGClipPath_DEFINED
 #define SkSVGClipPath_DEFINED
 
+#include "include/core/SkPath.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 SkSVGClipPath final : public SkSVGHiddenContainer {
 public:
     static sk_sp<SkSVGClipPath> Make() {

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

@@ -8,9 +8,16 @@
 #ifndef SkSVGContainer_DEFINED
 #define SkSVGContainer_DEFINED
 
+#include "include/core/SkPath.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "include/private/base/SkTArray.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTransformableNode.h"
 
+class SkSVGRenderContext;
+
 class SK_API SkSVGContainer : public SkSVGTransformableNode {
 public:
     void appendChild(sk_sp<SkSVGNode>) override;
@@ -26,7 +33,16 @@ protected:
 
     bool hasChildren() const final;
 
-    // TODO: add some sort of child iterator, and hide the container.
+    template <typename NodeType, typename Func>
+    void forEachChild(Func func) const {
+        for (const auto& child : fChildren) {
+            if (child->tag() == NodeType::tag) {
+                func(static_cast<const NodeType*>(child.get()));
+            }
+        }
+    }
+
+    // TODO: convert remaining direct users to iterators, and make the container private.
     skia_private::STArray<1, sk_sp<SkSVGNode>, true> fChildren;
 
 private:

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

@@ -11,16 +11,16 @@
 #include "include/core/SkFontMgr.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSize.h"
-#include "include/private/base/SkTemplates.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/skresources/include/SkResources.h"
+#include "modules/skshaper/include/SkShaper_factory.h"
 #include "modules/svg/include/SkSVGIDMapper.h"
+#include "modules/svg/include/SkSVGSVG.h"
 
 class SkCanvas;
-class SkDOM;
-class SkStream;
 class SkSVGNode;
+class SkStream;
 struct SkSVGPresentationContext;
-class SkSVGSVG;
 
 class SK_API SkSVGDOM : public SkRefCnt {
 public:
@@ -39,11 +39,18 @@ public:
          */
         Builder& setResourceProvider(sk_sp<skresources::ResourceProvider>);
 
+        /**
+         * Specify the callbacks for dealing with shaping text. See also
+         * modules/skshaper/utils/FactoryHelpers.h
+         */
+        Builder& setTextShapingFactory(sk_sp<SkShapers::Factory>);
+
         sk_sp<SkSVGDOM> make(SkStream&) const;
 
     private:
-        sk_sp<SkFontMgr>                     fFontMgr;
-        sk_sp<skresources::ResourceProvider> fResourceProvider;
+        sk_sp<SkFontMgr>                             fFontMgr;
+        sk_sp<skresources::ResourceProvider>         fResourceProvider;
+        sk_sp<SkShapers::Factory>                    fTextShapingFactory;
     };
 
     static sk_sp<SkSVGDOM> MakeFromStream(SkStream& str) {
@@ -89,15 +96,18 @@ public:
     void renderNode(SkCanvas*, SkSVGPresentationContext&, const char* id) const;
 
 private:
-    SkSVGDOM(sk_sp<SkSVGSVG>, sk_sp<SkFontMgr>, sk_sp<skresources::ResourceProvider>,
-             SkSVGIDMapper&&);
-
-    const sk_sp<SkSVGSVG>                      fRoot;
-    const sk_sp<SkFontMgr>                     fFontMgr;
-    const sk_sp<skresources::ResourceProvider> fResourceProvider;
-    const SkSVGIDMapper                        fIDMapper;
-
-    SkSize                 fContainerSize;
+    SkSVGDOM(sk_sp<SkSVGSVG>,
+             sk_sp<SkFontMgr>,
+             sk_sp<skresources::ResourceProvider>,
+             SkSVGIDMapper&&,
+             sk_sp<SkShapers::Factory>);
+
+    const sk_sp<SkSVGSVG>                       fRoot;
+    const sk_sp<SkFontMgr>                      fFontMgr;
+    const sk_sp<SkShapers::Factory>             fTextShapingFactory;
+    const sk_sp<skresources::ResourceProvider>  fResourceProvider;
+    const SkSVGIDMapper                         fIDMapper;
+    SkSize                                      fContainerSize;
 };
 
 #endif // SkSVGDOM_DEFINED

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

@@ -8,9 +8,19 @@
 #ifndef SkSVGEllipse_DEFINED
 #define SkSVGEllipse_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 "src/base/SkTLazy.h"
 
+class SkCanvas;
+class SkPaint;
+class SkSVGLengthContext;
+class SkSVGRenderContext;
+enum class SkPathFillType;
 struct SkRect;
 
 class SK_API SkSVGEllipse final : public SkSVGShape {
@@ -19,8 +29,9 @@ public:
 
     SVG_ATTR(Cx, SkSVGLength, SkSVGLength(0))
     SVG_ATTR(Cy, SkSVGLength, SkSVGLength(0))
-    SVG_ATTR(Rx, SkSVGLength, SkSVGLength(0))
-    SVG_ATTR(Ry, SkSVGLength, SkSVGLength(0))
+
+    SVG_OPTIONAL_ATTR(Rx, SkSVGLength)
+    SVG_OPTIONAL_ATTR(Ry, SkSVGLength)
 
 protected:
     bool parseAndSetAttribute(const char*, const char*) override;

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

@@ -8,12 +8,19 @@
 #ifndef SkSVGFe_DEFINED
 #define SkSVGFe_DEFINED
 
-#include <vector>
-
+#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"
+#include "src/base/SkTLazy.h"
+
+#include <vector>
 
 class SkImageFilter;
 class SkSVGFilterContext;
+class SkSVGRenderContext;
 
 class SK_API SkSVGFe : public SkSVGHiddenContainer {
 public:
@@ -21,12 +28,14 @@ public:
         switch (node->tag()) {
             case SkSVGTag::kFeBlend:
             case SkSVGTag::kFeColorMatrix:
+            case SkSVGTag::kFeComponentTransfer:
             case SkSVGTag::kFeComposite:
             case SkSVGTag::kFeDiffuseLighting:
             case SkSVGTag::kFeDisplacementMap:
             case SkSVGTag::kFeFlood:
             case SkSVGTag::kFeGaussianBlur:
             case SkSVGTag::kFeImage:
+            case SkSVGTag::kFeMerge:
             case SkSVGTag::kFeMorphology:
             case SkSVGTag::kFeOffset:
             case SkSVGTag::kFeSpecularLighting:

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

@@ -8,9 +8,18 @@
 #ifndef SkSVGFeBlend_DEFINED
 #define SkSVGFeBlend_DEFINED
 
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <vector>
+
+class SkImageFilter;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
+
 class SK_API SkSVGFeBlend : public SkSVGFe {
 public:
     enum class Mode {

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

@@ -8,10 +8,19 @@
 #ifndef SkSVGFeColorMatrix_DEFINED
 #define SkSVGFeColorMatrix_DEFINED
 
+#include "include/core/SkRefCnt.h"
 #include "include/effects/SkColorMatrix.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <vector>
+
+class SkImageFilter;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
+
 class SK_API SkSVGFeColorMatrix final : public SkSVGFe {
 public:
     static sk_sp<SkSVGFeColorMatrix> Make() {

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

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2024 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSVGFeComponentTransfer_DEFINED
+#define SkSVGFeComponentTransfer_DEFINED
+
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+#include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGHiddenContainer.h"
+#include "modules/svg/include/SkSVGNode.h"
+#include "modules/svg/include/SkSVGTypes.h"
+
+#include <cstdint>
+#include <vector>
+
+class SkImageFilter;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
+
+class SkSVGFeFunc final : public SkSVGHiddenContainer {
+public:
+    static sk_sp<SkSVGFeFunc> MakeFuncA() {
+        return sk_sp<SkSVGFeFunc>(new SkSVGFeFunc(SkSVGTag::kFeFuncA));
+    }
+
+    static sk_sp<SkSVGFeFunc> MakeFuncR() {
+        return sk_sp<SkSVGFeFunc>(new SkSVGFeFunc(SkSVGTag::kFeFuncR));
+    }
+
+    static sk_sp<SkSVGFeFunc> MakeFuncG() {
+        return sk_sp<SkSVGFeFunc>(new SkSVGFeFunc(SkSVGTag::kFeFuncG));
+    }
+
+    static sk_sp<SkSVGFeFunc> MakeFuncB() {
+        return sk_sp<SkSVGFeFunc>(new SkSVGFeFunc(SkSVGTag::kFeFuncB));
+    }
+
+    SVG_ATTR(Amplitude  , SkSVGNumberType,                          1)
+    SVG_ATTR(Exponent   , SkSVGNumberType,                          1)
+    SVG_ATTR(Intercept  , SkSVGNumberType,                          0)
+    SVG_ATTR(Offset     , SkSVGNumberType,                          0)
+    SVG_ATTR(Slope      , SkSVGNumberType,                          1)
+    SVG_ATTR(TableValues, std::vector<SkSVGNumberType>,            {})
+    SVG_ATTR(Type       , SkSVGFeFuncType, SkSVGFeFuncType::kIdentity)
+
+    std::vector<uint8_t> getTable() const;
+
+protected:
+    bool parseAndSetAttribute(const char*, const char*) override;
+
+private:
+    SkSVGFeFunc(SkSVGTag tag) : INHERITED(tag) {}
+
+    using INHERITED = SkSVGHiddenContainer;
+};
+
+class SK_API SkSVGFeComponentTransfer final : public SkSVGFe {
+public:
+    static constexpr SkSVGTag tag = SkSVGTag::kFeComponentTransfer;
+
+    static sk_sp<SkSVGFeComponentTransfer> Make() {
+        return sk_sp<SkSVGFeComponentTransfer>(new SkSVGFeComponentTransfer());
+    }
+
+protected:
+    sk_sp<SkImageFilter> onMakeImageFilter(const SkSVGRenderContext&,
+                                           const SkSVGFilterContext&) const override;
+
+    std::vector<SkSVGFeInputType> getInputs() const override { return {this->getIn()}; }
+
+private:
+    SkSVGFeComponentTransfer() : INHERITED(tag) {}
+
+    using INHERITED = SkSVGFe;
+};
+
+#endif //  SkSVGFeComponentTransfer_DEFINED

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

@@ -8,10 +8,19 @@
 #ifndef SkSVGFeComposite_DEFINED
 #define SkSVGFeComposite_DEFINED
 
-#include "include/core/SkBlendMode.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <vector>
+
+class SkImageFilter;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
+enum class SkBlendMode;
+
 class SK_API SkSVGFeComposite final : public SkSVGFe {
 public:
     static sk_sp<SkSVGFeComposite> Make() {

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

@@ -8,9 +8,19 @@
 #ifndef SkSVGFeDisplacementMap_DEFINED
 #define SkSVGFeDisplacementMap_DEFINED
 
+#include "include/core/SkColor.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <vector>
+
+class SkImageFilter;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
+
 class SK_API SkSVGFeDisplacementMap : public SkSVGFe {
 public:
     using ChannelSelector = SkColorChannel;

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

@@ -8,9 +8,19 @@
 #ifndef SkSVGFeFlood_DEFINED
 #define SkSVGFeFlood_DEFINED
 
+#include "include/core/SkColor.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <vector>
+
+class SkImageFilter;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
+
 class SK_API SkSVGFeFlood : public SkSVGFe {
 public:
     static sk_sp<SkSVGFeFlood> Make() { return sk_sp<SkSVGFeFlood>(new SkSVGFeFlood()); }

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

@@ -8,9 +8,18 @@
 #ifndef SkSVGFeGaussianBlur_DEFINED
 #define SkSVGFeGaussianBlur_DEFINED
 
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <vector>
+
+class SkImageFilter;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
+
 class SK_API SkSVGFeGaussianBlur : public SkSVGFe {
 public:
     struct StdDeviation {

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

@@ -8,9 +8,18 @@
 #ifndef SkSVGFeImage_DEFINED
 #define SkSVGFeImage_DEFINED
 
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <vector>
+
+class SkImageFilter;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
+
 class SK_API SkSVGFeImage : public SkSVGFe {
 public:
     static sk_sp<SkSVGFeImage> Make() { return sk_sp<SkSVGFeImage>(new SkSVGFeImage()); }

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

@@ -9,8 +9,13 @@
 #define SkSVGFeLightSource_DEFINED
 
 #include "include/core/SkPoint3.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+#include "include/private/base/SkDebug.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 SK_API SkSVGFeLightSource : public SkSVGHiddenContainer {
 public:

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

@@ -8,12 +8,23 @@
 #ifndef SkSVGFeLighting_DEFINED
 #define SkSVGFeLighting_DEFINED
 
+#include "include/core/SkColor.h"
+#include "include/core/SkPoint3.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
+#include "src/base/SkTLazy.h"
 
+#include <vector>
+
+class SkImageFilter;
 class SkSVGFeDistantLight;
 class SkSVGFePointLight;
 class SkSVGFeSpotLight;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
 
 class SK_API SkSVGFeLighting : public SkSVGFe {
 public:

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

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2024 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSVGFeMerge_DEFINED
+#define SkSVGFeMerge_DEFINED
+
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+#include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGHiddenContainer.h"
+#include "modules/svg/include/SkSVGNode.h"
+#include "modules/svg/include/SkSVGTypes.h"
+
+#include <vector>
+
+class SkImageFilter;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
+
+// https://www.w3.org/TR/SVG11/filters.html#feMergeNodeElement
+class SK_API SkSVGFeMergeNode : public SkSVGHiddenContainer {
+public:
+    static constexpr SkSVGTag tag = SkSVGTag::kFeMergeNode;
+
+    static sk_sp<SkSVGFeMergeNode> Make() {
+        return sk_sp<SkSVGFeMergeNode>(new SkSVGFeMergeNode());
+    }
+
+    SVG_ATTR(In, SkSVGFeInputType, SkSVGFeInputType())
+
+protected:
+    bool parseAndSetAttribute(const char*, const char*) override;
+
+private:
+    SkSVGFeMergeNode() : INHERITED(tag) {}
+
+    using INHERITED = SkSVGHiddenContainer;
+};
+
+// https://www.w3.org/TR/SVG11/filters.html#feMergeElement
+class SK_API SkSVGFeMerge : public SkSVGFe {
+public:
+    static constexpr SkSVGTag tag = SkSVGTag::kFeMerge;
+
+    static sk_sp<SkSVGFeMerge> Make() { return sk_sp<SkSVGFeMerge>(new SkSVGFeMerge()); }
+
+protected:
+    sk_sp<SkImageFilter> onMakeImageFilter(const SkSVGRenderContext&,
+                                           const SkSVGFilterContext&) const override;
+
+    std::vector<SkSVGFeInputType> getInputs() const override;
+
+private:
+    SkSVGFeMerge() : INHERITED(tag) {}
+
+    using INHERITED = SkSVGFe;
+};
+
+#endif //  SkSVGFeMerge_DEFINED

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

@@ -8,9 +8,17 @@
 #ifndef SkSVGFeMorphology_DEFINED
 #define SkSVGFeMorphology_DEFINED
 
+#include "include/core/SkRefCnt.h"
 #include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <vector>
+
+class SkImageFilter;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
+
 class SkSVGFeMorphology : public SkSVGFe {
 public:
     struct Radius {

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

@@ -8,9 +8,18 @@
 #ifndef SkSVGFeOffset_DEFINED
 #define SkSVGFeOffset_DEFINED
 
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <vector>
+
+class SkImageFilter;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
+
 class SK_API SkSVGFeOffset : public SkSVGFe {
 public:
     static sk_sp<SkSVGFeOffset> Make() { return sk_sp<SkSVGFeOffset>(new SkSVGFeOffset()); }

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

@@ -8,9 +8,18 @@
 #ifndef SkSVGFeTurbulence_DEFINED
 #define SkSVGFeTurbulence_DEFINED
 
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGFe.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <vector>
+
+class SkImageFilter;
+class SkSVGFilterContext;
+class SkSVGRenderContext;
+
 class SK_API SkSVGFeTurbulence : public SkSVGFe {
 public:
     static sk_sp<SkSVGFeTurbulence> Make() {

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

@@ -8,13 +8,22 @@
 #ifndef SkSVGFilter_DEFINED
 #define SkSVGFilter_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 SkImageFilter;
+class SkSVGRenderContext;
+
 class SK_API SkSVGFilter final : public SkSVGHiddenContainer {
 public:
     static sk_sp<SkSVGFilter> Make() { return sk_sp<SkSVGFilter>(new SkSVGFilter()); }
 
+    /** Propagates any inherited presentation attributes in the given context. */
+    void applyProperties(SkSVGRenderContext*) const;
+
     sk_sp<SkImageFilter> buildFilterDAG(const SkSVGRenderContext&) const;
 
     SVG_ATTR(X, SkSVGLength, SkSVGLength(-10, SkSVGLength::Unit::kPercentage))

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

@@ -8,14 +8,14 @@
 #ifndef SkSVGFilterContext_DEFINED
 #define SkSVGFilterContext_DEFINED
 
+#include "include/core/SkImageFilter.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
-#include "include/core/SkString.h"
 #include "modules/svg/include/SkSVGTypes.h"
 #include "src/core/SkTHash.h"
 
-class SkImageFilter;
-class SkSVGFeInputType;
+#include <tuple>
+
 class SkSVGRenderContext;
 
 class SkSVGFilterContext {

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

@@ -8,13 +8,21 @@
 #ifndef SkSVGGradient_DEFINED
 #define SkSVGGradient_DEFINED
 
-#include "include/core/SkShader.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/private/base/SkAPI.h"
+#include "include/private/base/SkTArray.h"
 #include "modules/svg/include/SkSVGHiddenContainer.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
-class SkMatrix;
+class SkPaint;
 class SkSVGRenderContext;
 class SkSVGStop;
+class SkShader;
+enum class SkTileMode;
 
 class SK_API SkSVGGradient : public SkSVGHiddenContainer {
 public:

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

@@ -8,9 +8,18 @@
 #ifndef SkSVGImage_DEFINED
 #define SkSVGImage_DEFINED
 
+#include "include/core/SkImage.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+#include "include/private/base/SkDebug.h"
+#include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTransformableNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+class SkSVGRenderContext;
+
 namespace skresources {
 class ResourceProvider;
 }