@shopify/react-native-skia 2.2.21 → 2.3.4

package/cpp/skia/modules/skcms/src/Transform_inl.h

@@ -111,14 +111,9 @@ template <typename D, typename S>
 SI D cast(const S& v) {
 #if N == 1
     return (D)v;
-#elif defined(__clang__)
-    return __builtin_convertvector(v, D);
 #else
-    D d;
-    for (int i = 0; i < N; i++) {
-        d[i] = v[i];
-    }
-    return d;
+    return __builtin_convertvector(v, D);
+
 #endif
 }
 
@@ -156,8 +151,13 @@ SI F F_from_Half(U16 half) {
 #elif defined(USING_AVX512F)
     return (F)_mm512_cvtph_ps((__m256i)half);
 #elif defined(USING_AVX_F16C)
+#if defined(__clang__) && __clang_major__ >= 15 // for _Float16 support
+    typedef _Float16 __attribute__((vector_size(16))) F16;
+    return __builtin_convertvector((F16)half, F);
+#else
     typedef int16_t __attribute__((vector_size(16))) I16;
     return __builtin_ia32_vcvtph2ps256((I16)half);
+#endif // defined(__clang))
 #else
     U32 wide = cast<U32>(half);
     // A half is 1-5-10 sign-exponent-mantissa, with 15 exponent bias.
@@ -359,6 +359,14 @@ SI F apply_hlginv(const skcms_TransferFunction* tf, F x) {
     return bit_pun<F>(sign | bit_pun<U32>(v));
 }
 
+// Compute the luminance Y used in the HLG OOTF. This is equivalent to computing the dot product
+// with the vector [0.2627 0.678  0.0593] in Rec2020 primaries, but is performed in the XYZD50
+// space to simplify the pipeline.
+SI F compute_Y_in_xyzd50(F x, F y, F z) {
+  return -0.02831655f * x +
+          1.00995452f * y +
+          0.02102382f * z;
+}
 
 // Strided loads and stores of N values, starting from p.
 template <typename T, typename P>
@@ -1216,6 +1224,27 @@ STAGE(hlg_rgb, const skcms_TransferFunction* tf) {
     b = apply_hlg(tf, b);
 }
 
+// Apply the HLG Reference OOTF, as described in ITU-R BT.2100-3 Table 5.
+STAGE(hlg_ootf_scale, const void*) {
+    // Compute Y in the XYZD50 primaries.
+    F Y = compute_Y_in_xyzd50(r, g, b);
+
+    // Apply the gamma of 1.2.
+    const float gamma_minus_1 = 0.2f;
+    U32 sign;
+    Y = strip_sign(Y, &sign);
+    F Y_to_gamma_minus1 = apply_sign(approx_pow(Y, gamma_minus_1), sign);
+    r = r * Y_to_gamma_minus1;
+    g = g * Y_to_gamma_minus1;
+    b = b * Y_to_gamma_minus1;
+
+    // Scale to the reference peak white (1000 nits) to get display luminance. Then divide by the
+    // HDR reference white (203 nits), to get a value in relative linear color space.
+    r *= 1000.0f / 203.0f;
+    g *= 1000.0f / 203.0f;
+    b *= 1000.0f / 203.0f;
+}
+
 STAGE(hlginv_r, const skcms_TransferFunction* tf) { r = apply_hlginv(tf, r); }
 STAGE(hlginv_g, const skcms_TransferFunction* tf) { g = apply_hlginv(tf, g); }
 STAGE(hlginv_b, const skcms_TransferFunction* tf) { b = apply_hlginv(tf, b); }
@@ -1227,6 +1256,23 @@ STAGE(hlginv_rgb, const skcms_TransferFunction* tf) {
     b = apply_hlginv(tf, b);
 }
 
+// Perform the inverse of the operation in hlg_ootf_scale.
+STAGE(hlginv_ootf_scale, const void*) {
+    r *= (203.f / 1000.0f);
+    g *= (203.f / 1000.0f);
+    b *= (203.f / 1000.0f);
+
+    const float gamma_inv_minus_1 = 1.0f / 1.2f - 1.0f;
+    F Y = compute_Y_in_xyzd50(r, g, b);
+    U32 sign;
+    Y = strip_sign(Y, &sign);
+    F Y_to_gamma_minus1 = apply_sign(approx_pow(Y, gamma_inv_minus_1), sign);
+
+    r = r * Y_to_gamma_minus1;
+    g = g * Y_to_gamma_minus1;
+    b = b * Y_to_gamma_minus1;
+}
+
 STAGE(table_r, const skcms_Curve* curve) { r = table(curve, r); }
 STAGE(table_g, const skcms_Curve* curve) { g = table(curve, g); }
 STAGE(table_b, const skcms_Curve* curve) { b = table(curve, b); }

package/cpp/skia/modules/skcms/src/skcms_Transform.h

@@ -72,12 +72,14 @@ namespace skcms_private {
     M(hlg_b)              \
     M(hlg_a)              \
     M(hlg_rgb)            \
+    M(hlg_ootf_scale)     \
                           \
     M(hlginv_r)           \
     M(hlginv_g)           \
     M(hlginv_b)           \
     M(hlginv_a)           \
     M(hlginv_rgb)         \
+    M(hlginv_ootf_scale)  \
                           \
     M(table_r)            \
     M(table_g)            \

package/cpp/skia/modules/skcms/src/skcms_internals.h

@@ -56,6 +56,14 @@ extern "C" {
                                                  && !defined(_WIN32) && !defined(__SYMBIAN32__)
             #define SKCMS_HAS_MUSTTAIL 1
         #endif
+    #elif defined(__GNUC__) && !defined(SKCMS_HAS_MUSTTAIL)
+        // GCC on riscv64 does not support our tail call functions
+        // cf. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121784
+        #if __has_cpp_attribute(clang::musttail) && !defined(__riscv)
+            #define SKCMS_HAS_MUSTTAIL 1
+        #else
+            #define SKCMS_HAS_MUSTTAIL 0
+        #endif
     #elif !defined(__clang__) && !defined(SKCMS_HAS_MUSTTAIL)
         #if __has_cpp_attribute(clang::musttail)
             #define SKCMS_HAS_MUSTTAIL 1

package/cpp/skia/modules/skottie/include/TextShaper.h

@@ -15,6 +15,7 @@
 #include "include/core/SkTypes.h"
 #include "include/private/base/SkTypeTraits.h"
 #include "include/utils/SkTextUtils.h"
+#include "modules/skunicode/include/SkUnicode.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -195,6 +196,9 @@ private:
     Shaper() = delete;
 };
 
+// Returns an SkUnicode wrapper which suppresses mid-word line breaks.
+sk_sp<SkUnicode> SK_API MakeStrictLinebreakUnicode(sk_sp<SkUnicode>);
+
 } // namespace skottie
 
 #endif // SkottieTextShaper_DEFINED

package/cpp/skia/modules/skparagraph/include/FontCollection.h

@@ -36,7 +36,7 @@ public:
     std::vector<sk_sp<SkTypeface>> findTypefaces(const std::vector<SkString>& familyNames, SkFontStyle fontStyle);
     std::vector<sk_sp<SkTypeface>> findTypefaces(const std::vector<SkString>& familyNames, SkFontStyle fontStyle, const std::optional<FontArguments>& fontArgs);
 
-    sk_sp<SkTypeface> defaultFallback(SkUnichar unicode, SkFontStyle fontStyle, const SkString& locale);
+    sk_sp<SkTypeface> defaultFallback(SkUnichar unicode, SkFontStyle fontStyle, const SkString& locale, const std::optional<FontArguments>& fontArgs);
     sk_sp<SkTypeface> defaultEmojiFallback(SkUnichar emojiStart, SkFontStyle fontStyle, const SkString& locale);
     sk_sp<SkTypeface> defaultFallback();
 

package/cpp/skia/modules/skparagraph/include/ParagraphStyle.h

@@ -84,7 +84,9 @@ struct ParagraphStyle {
                this->fEllipsisUtf16 == rhs.fEllipsisUtf16 &&
                this->fTextDirection == rhs.fTextDirection && this->fTextAlign == rhs.fTextAlign &&
                this->fDefaultTextStyle == rhs.fDefaultTextStyle &&
-               this->fReplaceTabCharacters == rhs.fReplaceTabCharacters;
+               this->fReplaceTabCharacters == rhs.fReplaceTabCharacters &&
+               this->fFakeMissingFontStyles == rhs.fFakeMissingFontStyles;
+
     }
 
     const StrutStyle& getStrutStyle() const { return fStrutStyle; }
@@ -121,6 +123,9 @@ struct ParagraphStyle {
     bool hintingIsOn() const { return fHintingIsOn; }
     void turnHintingOff() { fHintingIsOn = false; }
 
+    bool fakeMissingFontStyles() const { return fFakeMissingFontStyles; }
+    void setFakeMissingFontStyles(bool value) { fFakeMissingFontStyles = value; }
+
     bool getReplaceTabCharacters() const { return fReplaceTabCharacters; }
     void setReplaceTabCharacters(bool value) { fReplaceTabCharacters = value; }
 
@@ -139,6 +144,7 @@ private:
     TextHeightBehavior fTextHeightBehavior;
     bool fHintingIsOn;
     bool fReplaceTabCharacters;
+    bool fFakeMissingFontStyles;
     bool fApplyRoundingHack = true;
 };
 }  // namespace textlayout

package/cpp/skia/modules/skparagraph/include/TextStyle.h

@@ -287,6 +287,15 @@ public:
     bool isPlaceholder() const { return fIsPlaceholder; }
     void setPlaceholder() { fIsPlaceholder = true; }
 
+    void setFontEdging(SkFont::Edging edging) { fEdging = edging; }
+    SkFont::Edging getFontEdging() const { return fEdging; }
+
+    void setSubpixel(bool subpixel) { fSubpixel = subpixel; }
+    bool getSubpixel() const { return fSubpixel; }
+
+    void setFontHinting(SkFontHinting hinting) { fHinting = hinting; }
+    SkFontHinting getFontHinting() const { return fHinting; }
+
 private:
     static const std::vector<SkString>* kDefaultFontFamilies;
 
@@ -305,6 +314,9 @@ private:
     std::vector<SkString> fFontFamilies = *kDefaultFontFamilies;
 
     SkScalar fFontSize = 14.0;
+    SkFont::Edging fEdging = SkFont::Edging::kAntiAlias;
+    bool fSubpixel = true;
+    SkFontHinting fHinting = SkFontHinting::kSlight;
     SkScalar fHeight = 1.0;
     bool fHeightOverride = false;
     SkScalar fBaselineShift = 0.0f;

package/cpp/skia/modules/sksg/include/SkSGGeometryEffect.h

@@ -10,6 +10,7 @@
 
 #include "include/core/SkPaint.h"
 #include "include/core/SkPath.h"
+#include "include/core/SkPathTypes.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
@@ -103,6 +104,31 @@ private:
     using INHERITED = GeometryEffect;
 };
 
+/**
+ * Overrides the child geometry fill type.
+ */
+class FillTypeOverride final : public GeometryEffect {
+public:
+    static sk_sp<FillTypeOverride> Make(sk_sp<GeometryNode> child, SkPathFillType ft) {
+        return child ? sk_sp<FillTypeOverride>(new FillTypeOverride(std::move(child), ft))
+                     : nullptr;
+    }
+
+    SG_ATTRIBUTE(FillType, SkPathFillType, fFillType)
+
+private:
+    FillTypeOverride(sk_sp<GeometryNode> child, SkPathFillType ft)
+        : INHERITED(std::move(child))
+        , fFillType(ft)
+    {}
+
+    SkPath onRevalidateEffect(const sk_sp<GeometryNode>&, const SkMatrix&) override;
+
+    SkPathFillType fFillType = SkPathFillType::kDefault;
+
+    using INHERITED = GeometryEffect;
+};
+
 /**
  * Apply a dash effect to the child geometry.
  *

package/cpp/skia/modules/sksg/include/SkSGPath.h

@@ -9,6 +9,7 @@
 #define SkSGPath_DEFINED
 
 #include "include/core/SkPath.h"
+#include "include/core/SkPathTypes.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "modules/sksg/include/SkSGGeometryNode.h"
@@ -17,7 +18,6 @@
 class SkCanvas;
 class SkMatrix;
 class SkPaint;
-enum class SkPathFillType;
 struct SkPoint;
 
 namespace sksg {

package/cpp/skia/modules/skunicode/include/SkUnicode.h

@@ -15,6 +15,7 @@
 #include "src/base/SkUTF.h"
 #include <cstddef>
 #include <cstdint>
+#include <limits>
 #include <memory>
 #include <string>
 #include <vector>
@@ -55,6 +56,9 @@ public:
         kLTR,
         kRTL,
     };
+    SkBidiIterator() = default;
+    SkBidiIterator(const SkBidiIterator&) = default;
+    SkBidiIterator& operator=(const SkBidiIterator&) = default;
     virtual ~SkBidiIterator() = default;
     virtual Position getLength() = 0;
     virtual Level getLevelAt(Position) = 0;
@@ -64,6 +68,9 @@ class SKUNICODE_API SkBreakIterator {
 public:
     typedef int32_t Position;
     typedef int32_t Status;
+    SkBreakIterator() = default;
+    SkBreakIterator(const SkBreakIterator&) = default;
+    SkBreakIterator& operator=(const SkBreakIterator&) = default;
     virtual ~SkBreakIterator() = default;
     virtual Position first() = 0;
     virtual Position current() = 0;
@@ -271,7 +278,10 @@ class SKUNICODE_API SkUnicode : public SkRefCnt {
 
             SkBidiIterator::Position pos16 = 0;
             while (pos16 <= iter->getLength()) {
-                uint16_t nextPos16 = start16 - utf16;
+                const auto nextPos16 = SkTo<SkBidiIterator::Position>(start16 - utf16);
+                // The pointer difference is bound by utf16Units, and cannot overflow nextPos16.
+                static_assert(std::numeric_limits<decltype(utf16Units)>::max() <=
+                              std::numeric_limits<decltype(nextPos16)>::max());
                 auto level = iter->getLevelAt(nextPos16);
                 if (nextPos16 == 0) {
                     currentLevel = level;

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

@@ -14,10 +14,9 @@
 #include "include/private/base/SkNoncopyable.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
-#include "src/base/SkTLazy.h"
-
 #include <cstdint>
 #include <cstring>
+#include <optional>
 #include <tuple>
 #include <vector>
 
@@ -36,15 +35,14 @@ public:
     //      so they can be used by parse<T>():
     bool parse(SkSVGIntegerType* v) { return parseInteger(v); }
 
-    template <typename T> using ParseResult = SkTLazy<T>;
+    template <typename T> using ParseResult = std::optional<T>;
 
     template <typename T> static ParseResult<T> parse(const char* value) {
-        ParseResult<T> result;
         T parsedValue;
         if (SkSVGAttributeParser(value).parse(&parsedValue)) {
-            result.set(std::move(parsedValue));
+            return parsedValue;
         }
-        return result;
+        return {};
     }
 
     template <typename T>
@@ -67,14 +65,12 @@ public:
         }
 
         if (!strcmp(value, "inherit")) {
-            PropertyT result(SkSVGPropertyState::kInherit);
-            return ParseResult<PropertyT>(&result);
+            return PropertyT(SkSVGPropertyState::kInherit);
         }
 
         auto pr = parse<typename PropertyT::ValueT>(value);
-        if (pr.isValid()) {
-            PropertyT result(*pr);
-            return ParseResult<PropertyT>(&result);
+        if (pr.has_value()) {
+            return PropertyT(*pr);
         }
 
         return ParseResult<PropertyT>();

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

@@ -9,6 +9,7 @@
 #define SkSVGCircle_DEFINED
 
 #include "include/core/SkPath.h"
+#include "include/core/SkPathTypes.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
@@ -23,7 +24,6 @@ class SkCanvas;
 class SkPaint;
 class SkSVGLengthContext;
 class SkSVGRenderContext;
-enum class SkPathFillType;
 struct SkPoint;
 
 class SK_API SkSVGCircle final : public SkSVGShape {

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

@@ -9,18 +9,17 @@
 #define SkSVGEllipse_DEFINED
 
 #include "include/core/SkPath.h"
+#include "include/core/SkPathTypes.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 {

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

@@ -14,7 +14,6 @@
 #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>
 

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

@@ -15,7 +15,6 @@
 #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

@@ -15,7 +15,6 @@
 #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>
 

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

@@ -9,6 +9,7 @@
 #define SkSVGLine_DEFINED
 
 #include "include/core/SkPath.h"
+#include "include/core/SkPathTypes.h"
 #include "include/core/SkRefCnt.h"
 #include "include/private/base/SkAPI.h"
 #include "modules/svg/include/SkSVGNode.h"
@@ -21,7 +22,6 @@ 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/SkSVGNode.h

@@ -15,6 +15,7 @@
 #include "modules/svg/include/SkSVGAttributeParser.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
+#include <optional>
 #include <utility>
 
 class SkMatrix;
@@ -76,8 +77,8 @@ enum class SkSVGTag {
 private:                                                                     \
     bool set##attr_name(SkSVGAttributeParser::ParseResult<                   \
                             SkSVGProperty<attr_type, attr_inherited>>&& pr) {\
-        if (pr.isValid()) { this->set##attr_name(std::move(*pr)); }          \
-        return pr.isValid();                                                 \
+        if (pr.has_value()) { this->set##attr_name(std::move(*pr)); }        \
+        return pr.has_value();                                               \
     }                                                                        \
                                                                              \
 public:                                                                      \
@@ -199,13 +200,13 @@ private:
     private:                                                                  \
         bool set##attr_name(                                                  \
                 const SkSVGAttributeParser::ParseResult<attr_type>& pr) {     \
-            if (pr.isValid()) { this->set##attr_name(*pr); }                  \
-            return pr.isValid();                                              \
+            if (pr.has_value()) { this->set##attr_name(*pr); }                \
+            return pr.has_value();                                            \
         }                                                                     \
         bool set##attr_name(                                                  \
                 SkSVGAttributeParser::ParseResult<attr_type>&& pr) {          \
-            if (pr.isValid()) { this->set##attr_name(std::move(*pr)); }       \
-            return pr.isValid();                                              \
+            if (pr.has_value()) { this->set##attr_name(std::move(*pr)); }     \
+            return pr.has_value();                                            \
         }                                                                     \
     public:                                                                   \
         void set##attr_name(const attr_type& a) { set_cp(a); }                \
@@ -223,12 +224,12 @@ private:
 
 #define SVG_OPTIONAL_ATTR(attr_name, attr_type)                                   \
     private:                                                                      \
-        SkTLazy<attr_type> f##attr_name;                                          \
+        std::optional<attr_type> f##attr_name;                                          \
     public:                                                                       \
-        const SkTLazy<attr_type>& get##attr_name() const { return f##attr_name; } \
+        const std::optional<attr_type>& get##attr_name() const { return f##attr_name; } \
     _SVG_ATTR_SETTERS(                                                            \
             attr_name, attr_type, attr_default,                                   \
-            [this](const attr_type& a) { this->f##attr_name.set(a); },            \
-            [this](attr_type&& a) { this->f##attr_name.set(std::move(a)); })
+            [this](const attr_type& a) { this->f##attr_name = a; },            \
+            [this](attr_type&& a) { this->f##attr_name = std::move(a); })
 
 #endif // SkSVGNode_DEFINED

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

@@ -9,6 +9,7 @@
 #define SkSVGPath_DEFINED
 
 #include "include/core/SkPath.h"
+#include "include/core/SkPathTypes.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/private/base/SkAPI.h"
@@ -19,7 +20,6 @@ class SkCanvas;
 class SkPaint;
 class SkSVGLengthContext;
 class SkSVGRenderContext;
-enum class SkPathFillType;
 
 class SK_API SkSVGPath final : public SkSVGShape {
 public:

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

@@ -13,7 +13,8 @@
 #include "modules/svg/include/SkSVGHiddenContainer.h"
 #include "modules/svg/include/SkSVGNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
-#include "src/base/SkTLazy.h"
+
+#include <optional>
 
 class SkPaint;
 class SkSVGRenderContext;
@@ -40,11 +41,11 @@ protected:
 
 private:
     struct PatternAttributes {
-        SkTLazy<SkSVGLength>        fX,
+        std::optional<SkSVGLength>  fX,
                                     fY,
                                     fWidth,
                                     fHeight;
-        SkTLazy<SkSVGTransformType> fPatternTransform;
+        std::optional<SkSVGTransformType> fPatternTransform;
     };
 
     const SkSVGPattern* resolveHref(const SkSVGRenderContext&, PatternAttributes*) const;

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

@@ -9,6 +9,7 @@
 #define SkSVGPoly_DEFINED
 
 #include "include/core/SkPath.h"
+#include "include/core/SkPathTypes.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/private/base/SkAPI.h"
@@ -20,7 +21,6 @@ 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

@@ -15,7 +15,6 @@
 #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;

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

@@ -9,20 +9,19 @@
 #define SkSVGRect_DEFINED
 
 #include "include/core/SkPath.h"
+#include "include/core/SkPathTypes.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

@@ -141,13 +141,13 @@ public:
     // (effectively breaks reference cycles, assuming appropriate return value scoping).
     BorrowedNode findNodeById(const SkSVGIRI&) const;
 
-    SkTLazy<SkPaint> fillPaint() const;
-    SkTLazy<SkPaint> strokePaint() const;
+    std::optional<SkPaint> fillPaint() const;
+    std::optional<SkPaint> strokePaint() const;
 
     SkSVGColorType resolveSvgColor(const SkSVGColor&) const;
 
     // The local computed clip path (not inherited).
-    const SkPath* clipPath() const { return fClipPath.getMaybeNull(); }
+    const SkPath* clipPath() const { return SkOptAddressOrNull(fClipPath); }
 
     const sk_sp<skresources::ResourceProvider>& resourceProvider() const {
         return fResourceProvider;
@@ -203,7 +203,7 @@ private:
     void applyClip(const SkSVGFuncIRI&);
     void applyMask(const SkSVGFuncIRI&);
 
-    SkTLazy<SkPaint> commonPaint(const SkSVGPaint&, float opacity) const;
+    std::optional<SkPaint> commonPaint(const SkSVGPaint&, float opacity) const;
 
     const sk_sp<SkFontMgr>&                       fFontMgr;
     const sk_sp<SkShapers::Factory>&              fTextShapingFactory;
@@ -217,7 +217,7 @@ private:
     int                                           fCanvasSaveCount;
 
     // clipPath, if present for the current context (not inherited).
-    SkTLazy<SkPath>                               fClipPath;
+    std::optional<SkPath>                         fClipPath;
 
     // Deferred opacity optimization for leaf nodes.
     float                                         fDeferredPaintOpacity = 1;

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

@@ -15,7 +15,6 @@
 #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;

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

@@ -8,6 +8,7 @@
 #ifndef SkSVGShape_DEFINED
 #define SkSVGShape_DEFINED
 
+#include "include/core/SkPathTypes.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/private/base/SkAPI.h"
@@ -18,7 +19,6 @@ class SkPaint;
 class SkSVGLengthContext;
 class SkSVGNode;
 class SkSVGRenderContext;
-enum class SkPathFillType;
 enum class SkSVGTag;
 
 class SK_API SkSVGShape : public SkSVGTransformableNode {

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

@@ -30,9 +30,9 @@ protected:
 
     void onSetAttribute(SkSVGAttribute, const SkSVGValue&) override;
 
-    void mapToParent(SkPath*) const;
+    SkPath mapToParent(const SkPath&) const;
 
-    void mapToParent(SkRect*) const;
+    SkRect mapToParent(const SkRect&) const;
 
     SkRect onObjectBoundingBox(const SkSVGRenderContext& ) const final;