@shopify/react-native-skia 0.1.192 → 0.1.194

package/cpp/skia/include/utils/SkNWayCanvas.h

@@ -9,17 +9,14 @@
 #ifndef SkNWayCanvas_DEFINED
 #define SkNWayCanvas_DEFINED
 
-#include "include/core/SkBlendMode.h"
-#include "include/core/SkCanvas.h"
 #include "include/core/SkCanvasVirtualEnforcer.h"
-#include "include/core/SkClipOp.h"
 #include "include/core/SkColor.h"
 #include "include/core/SkM44.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSamplingOptions.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
 #include "include/utils/SkNoDrawCanvas.h"
 
 #include <cstddef>
@@ -28,6 +25,7 @@ namespace sktext {
 class GlyphRunList;
 }
 
+class SkCanvas;
 class SkData;
 class SkDrawable;
 class SkImage;
@@ -40,12 +38,14 @@ class SkRegion;
 class SkShader;
 class SkTextBlob;
 class SkVertices;
+enum class SkBlendMode;
+enum class SkClipOp;
 struct SkDrawShadowRec;
 struct SkPoint;
 struct SkRSXform;
 struct SkRect;
 
-#if SK_SUPPORT_GPU
+#if defined(SK_GANESH)
 namespace sktext::gpu {
 class Slug;
 }
@@ -77,7 +77,7 @@ protected:
     void onDrawGlyphRunList(const sktext::GlyphRunList&, const SkPaint&) override;
     void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                         const SkPaint& paint) override;
-#if SK_SUPPORT_GPU
+#if defined(SK_GANESH)
     void onDrawSlug(const sktext::gpu::Slug* slug) override;
 #endif
     void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],

package/cpp/skia/include/utils/SkOrderedFontMgr.h

@@ -39,14 +39,15 @@ public:
 protected:
     int onCountFamilies() const override;
     void onGetFamilyName(int index, SkString* familyName) const override;
-    SkFontStyleSet* onCreateStyleSet(int index)const override;
+    sk_sp<SkFontStyleSet> onCreateStyleSet(int index)const override;
 
-    SkFontStyleSet* onMatchFamily(const char familyName[]) const override;
+    sk_sp<SkFontStyleSet> onMatchFamily(const char familyName[]) const override;
 
-    SkTypeface* onMatchFamilyStyle(const char familyName[], const SkFontStyle&) const override;
-    SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
-                                            const char* bcp47[], int bcp47Count,
-                                            SkUnichar character) const override;
+    sk_sp<SkTypeface> onMatchFamilyStyle(const char familyName[],
+                                         const SkFontStyle&) const override;
+    sk_sp<SkTypeface> onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
+                                                  const char* bcp47[], int bcp47Count,
+                                                  SkUnichar character) const override;
 
     // Note: all of these always return null
     sk_sp<SkTypeface> onMakeFromData(sk_sp<SkData>, int ttcIndex) const override;

package/cpp/skia/include/utils/SkPaintFilterCanvas.h

@@ -8,7 +8,6 @@
 #ifndef SkPaintFilterCanvas_DEFINED
 #define SkPaintFilterCanvas_DEFINED
 
-#include "include/core/SkBlendMode.h"
 #include "include/core/SkCanvas.h"
 #include "include/core/SkCanvasVirtualEnforcer.h"
 #include "include/core/SkColor.h"
@@ -18,7 +17,7 @@
 #include "include/core/SkScalar.h"
 #include "include/core/SkSize.h"
 #include "include/core/SkTypes.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
 #include "include/utils/SkNWayCanvas.h"
 
 #include <cstddef>
@@ -42,6 +41,7 @@ class SkSurface;
 class SkSurfaceProps;
 class SkTextBlob;
 class SkVertices;
+enum class SkBlendMode;
 struct SkDrawShadowRec;
 struct SkPoint;
 struct SkRSXform;

package/cpp/skia/include/utils/SkParsePath.h

@@ -19,7 +19,7 @@ public:
     static bool FromSVGString(const char str[], SkPath*);
 
     enum class PathEncoding { Absolute, Relative };
-    static void ToSVGString(const SkPath&, SkString*, PathEncoding = PathEncoding::Absolute);
+    static SkString ToSVGString(const SkPath&, PathEncoding = PathEncoding::Absolute);
 };
 
 #endif

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

@@ -51,6 +51,17 @@ SKCMS_API float skcms_TransferFunction_eval  (const skcms_TransferFunction*, flo
 SKCMS_API bool  skcms_TransferFunction_invert(const skcms_TransferFunction*,
                                               skcms_TransferFunction*);
 
+typedef enum skcms_TFType {
+    skcms_TFType_Invalid,
+    skcms_TFType_sRGBish,
+    skcms_TFType_PQish,
+    skcms_TFType_HLGish,
+    skcms_TFType_HLGinvish,
+} skcms_TFType;
+
+// Identify which kind of transfer function is encoded in an skcms_TransferFunction
+SKCMS_API skcms_TFType skcms_TransferFunction_getType(const skcms_TransferFunction*);
+
 // We can jam a couple alternate transfer function forms into skcms_TransferFunction,
 // including those matching the general forms of the SMPTE ST 2084 PQ function or HLG.
 //
@@ -307,6 +318,9 @@ typedef enum skcms_PixelFormat {
     skcms_PixelFormat_BGR_fff,        // Pointers must be 32-bit aligned.
     skcms_PixelFormat_RGBA_ffff,
     skcms_PixelFormat_BGRA_ffff,
+
+    skcms_PixelFormat_RGB_101010x_XR,  // Note: This is located here to signal no clamping.
+    skcms_PixelFormat_BGR_101010x_XR,  // Compatible with MTLPixelFormatBGR10_XR.
 } skcms_PixelFormat;
 
 // We always store any alpha channel linearly.  In the chart below, tf-1() is the inverse

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

@@ -903,6 +903,16 @@ static void exec_ops(const Op* ops, const void** args,
                 a = cast<F>((rgba >> 30) & 0x3  ) * (1/   3.0f);
             } break;
 
+            case Op_load_101010x_XR:{
+                static constexpr float min = -0.752941f;
+                static constexpr float max = 1.25098f;
+                static constexpr float range = max - min;
+                U32 rgba = load<U32>(src + 4*i);
+                r = cast<F>((rgba >>  0) & 0x3ff) * (1/1023.0f) * range + min;
+                g = cast<F>((rgba >> 10) & 0x3ff) * (1/1023.0f) * range + min;
+                b = cast<F>((rgba >> 20) & 0x3ff) * (1/1023.0f) * range + min;
+            } break;
+
             case Op_load_161616LE:{
                 uintptr_t ptr = (uintptr_t)(src + 6*i);
                 assert( (ptr & 1) == 0 );                   // src must be 2-byte aligned for this
@@ -1313,6 +1323,15 @@ static void exec_ops(const Op* ops, const void** args,
                                | cast<U32>(to_fixed(a * 255)) << 24);
             } return;
 
+            case Op_store_101010x_XR: {
+                static constexpr float min = -0.752941f;
+                static constexpr float max = 1.25098f;
+                static constexpr float range = max - min;
+                store(dst + 4*i, cast<U32>(to_fixed(((r - min) / range) * 1023)) <<  0
+                               | cast<U32>(to_fixed(((g - min) / range) * 1023)) << 10
+                               | cast<U32>(to_fixed(((b - min) / range) * 1023)) << 20);
+                return;
+            }
             case Op_store_1010102: {
                 store(dst + 4*i, cast<U32>(to_fixed(r * 1023)) <<  0
                                | cast<U32>(to_fixed(g * 1023)) << 10

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

@@ -7,10 +7,10 @@
 #include <set>
 #include "include/core/SkFontMgr.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/SkTHash.h"
 #include "modules/skparagraph/include/FontArguments.h"
 #include "modules/skparagraph/include/ParagraphCache.h"
 #include "modules/skparagraph/include/TextStyle.h"
+#include "src/core/SkTHash.h"
 
 namespace skia {
 namespace textlayout {
@@ -69,7 +69,7 @@ private:
     };
 
     bool fEnableFontFallback;
-    SkTHashMap<FamilyKey, std::vector<sk_sp<SkTypeface>>, FamilyKey::Hasher> fTypefaces;
+    skia_private::THashMap<FamilyKey, std::vector<sk_sp<SkTypeface>>, FamilyKey::Hasher> fTypefaces;
     sk_sp<SkFontMgr> fDefaultFontManager;
     sk_sp<SkFontMgr> fAssetFontManager;
     sk_sp<SkFontMgr> fDynamicFontManager;

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

@@ -12,6 +12,8 @@ class SkCanvas;
 namespace skia {
 namespace textlayout {
 
+class ParagraphPainter;
+
 class Paragraph {
 
 public:
@@ -39,6 +41,8 @@ public:
 
     virtual void paint(SkCanvas* canvas, SkScalar x, SkScalar y) = 0;
 
+    virtual void paint(ParagraphPainter* painter, SkScalar x, SkScalar y) = 0;
+
     // Returns a vector of bounding boxes that enclose all text between
     // start and end glyph indexes, including start and excluding end
     virtual std::vector<TextBox> getRectsForRange(unsigned start,
@@ -66,9 +70,9 @@ public:
     // -1 if not applicable (has not been shaped yet - valid case)
     virtual int32_t unresolvedGlyphs() = 0;
 
-    // Experimental API that allows fast way to update "immutable" paragraph
+    // Experimental API that allows fast way to update some of "immutable" paragraph attributes
+    // but not the text itself
     virtual void updateTextAlign(TextAlign textAlign) = 0;
-    virtual void updateText(size_t from, SkString text) = 0;
     virtual void updateFontSize(size_t from, size_t to, SkScalar fontSize) = 0;
     virtual void updateForegroundPaint(size_t from, size_t to, SkPaint paint) = 0;
     virtual void updateBackgroundPaint(size_t from, size_t to, SkPaint paint) = 0;
@@ -91,6 +95,72 @@ public:
     using Visitor = std::function<void(int lineNumber, const VisitorInfo*)>;
     virtual void visit(const Visitor&) = 0;
 
+    // Editing API
+    virtual int getLineNumberAt(TextIndex codeUnitIndex) const = 0;
+
+    /* Returns line metrics info for the line
+     *
+     * @param lineNumber    a line number
+     * @param lineMetrics   an address to return the info (in case of null just skipped)
+     * @return              true if the line is found; false if not
+     */
+    virtual bool getLineMetricsAt(int lineNumber, LineMetrics* lineMetrics) const = 0;
+
+    /* Returns the visible text on the line (excluding a possible ellipsis)
+     *
+     * @param lineNumber    a line number
+     * @param includeSpaces indicates if the whitespaces should be included
+     * @return              the range of the text that is shown in the line
+     */
+    virtual TextRange getActualTextRange(int lineNumber, bool includeSpaces) const = 0;
+
+    struct GlyphClusterInfo {
+        SkRect fBounds;
+        TextRange fClusterTextRange;
+        TextDirection fGlyphClusterPosition;
+    };
+
+    /** Finds a glyph cluster for text index
+     *
+     * @param codeUnitIndex   a text index
+     * @param glyphInfo       a glyph cluster info filled if not null
+     * @return                true if glyph cluster was found; false if not
+     */
+    virtual bool getGlyphClusterAt(TextIndex codeUnitIndex, GlyphClusterInfo* glyphInfo) = 0;
+
+    /** Finds the closest glyph cluster for a visual text position
+     *
+     * @param dx              x coordinate
+     * @param dy              y coordinate
+     * @param glyphInfo       a glyph cluster info filled if not null
+     * @return
+     */
+    virtual bool getClosestGlyphClusterAt(SkScalar dx,
+                                          SkScalar dy,
+                                          GlyphClusterInfo* glyphInfo) = 0;
+
+    struct FontInfo {
+        FontInfo(const SkFont font, const TextRange textRange)
+            : fFont(font), fTextRange(textRange) { }
+        virtual ~FontInfo() = default;
+        FontInfo(const FontInfo& ) = default;
+        SkFont fFont;
+        TextRange fTextRange;
+    };
+
+    /** Returns the font that is used to shape the text at the position
+     *
+     * @param codeUnitIndex   text index
+     * @return                font info or an empty font info if the text is not found
+     */
+    virtual SkFont getFontAt(TextIndex codeUnitIndex) const = 0;
+
+    /** Returns the information about all the fonts used to shape the paragraph text
+     *
+     * @return                a list of fonts and text ranges
+     */
+    virtual std::vector<FontInfo> getFonts() const = 0;
+
 protected:
     sk_sp<FontCollection> fFontCollection;
     ParagraphStyle fParagraphStyle;

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

@@ -2,7 +2,7 @@
 #ifndef ParagraphCache_DEFINED
 #define ParagraphCache_DEFINED
 
-#include "include/private/SkMutex.h"
+#include "include/private/base/SkMutex.h"
 #include "src/core/SkLRUCache.h"
 #include <functional>  // std::function
 
@@ -11,16 +11,6 @@
 namespace skia {
 namespace textlayout {
 
-enum InternalState {
-  kUnknown = 0,
-  kShaped = 2,
-  kClusterized = 3,
-  kMarked = 4,
-  kLineBroken = 5,
-  kFormatted = 6,
-  kDrawn = 7
-};
-
 class ParagraphImpl;
 class ParagraphCacheKey;
 class ParagraphCacheValue;

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

@@ -0,0 +1,63 @@
+// Copyright 2019 Google LLC.
+#ifndef ParagraphPainter_DEFINED
+#define ParagraphPainter_DEFINED
+
+#include "include/core/SkPaint.h"
+#include "include/core/SkTextBlob.h"
+
+#include <optional>
+#include <variant>
+
+namespace skia {
+namespace textlayout {
+
+class ParagraphPainter {
+public:
+    typedef int PaintID;
+    typedef std::variant<SkPaint, PaintID> SkPaintOrID;
+
+    struct DashPathEffect {
+        DashPathEffect(SkScalar onLength, SkScalar offLength);
+
+        SkScalar fOnLength;
+        SkScalar fOffLength;
+    };
+
+    class DecorationStyle {
+    public:
+        DecorationStyle();
+        DecorationStyle(SkColor color, SkScalar strokeWidth,
+                        std::optional<DashPathEffect> dashPathEffect);
+
+        SkColor getColor() const { return fColor; }
+        SkScalar getStrokeWidth() const { return fStrokeWidth; }
+        std::optional<DashPathEffect> getDashPathEffect() const { return fDashPathEffect; }
+        const SkPaint& skPaint() const { return fPaint; }
+
+    private:
+        SkColor fColor;
+        SkScalar fStrokeWidth;
+        std::optional<DashPathEffect> fDashPathEffect;
+        SkPaint fPaint;
+    };
+
+    virtual ~ParagraphPainter() = default;
+
+    virtual void drawTextBlob(const sk_sp<SkTextBlob>& blob, SkScalar x, SkScalar y, const SkPaintOrID& paint) = 0;
+    virtual void drawTextShadow(const sk_sp<SkTextBlob>& blob, SkScalar x, SkScalar y, SkColor color, SkScalar blurSigma) = 0;
+    virtual void drawRect(const SkRect& rect, const SkPaintOrID& paint) = 0;
+    virtual void drawFilledRect(const SkRect& rect, const DecorationStyle& decorStyle) = 0;
+    virtual void drawPath(const SkPath& path, const DecorationStyle& decorStyle) = 0;
+    virtual void drawLine(SkScalar x0, SkScalar y0, SkScalar x1, SkScalar y1, const DecorationStyle& decorStyle) = 0;
+
+    virtual void clipRect(const SkRect& rect) = 0;
+    virtual void translate(SkScalar dx, SkScalar dy) = 0;
+
+    virtual void save() = 0;
+    virtual void restore() = 0;
+};
+
+}  // namespace textlayout
+}  // namespace skia
+
+#endif  // ParagraphPainter_DEFINED

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

@@ -12,6 +12,7 @@
 #include "include/core/SkScalar.h"
 #include "modules/skparagraph/include/DartTypes.h"
 #include "modules/skparagraph/include/FontArguments.h"
+#include "modules/skparagraph/include/ParagraphPainter.h"
 #include "modules/skparagraph/include/TextShadow.h"
 
 // TODO: Make it external so the other platforms (Android) could use it
@@ -165,19 +166,41 @@ public:
     void setColor(SkColor color) { fColor = color; }
 
     bool hasForeground() const { return fHasForeground; }
-    SkPaint getForeground() const { return fForeground; }
+    SkPaint getForeground() const {
+        const SkPaint* paint = std::get_if<SkPaint>(&fForeground);
+        return paint ? *paint : SkPaint();
+    }
+    ParagraphPainter::SkPaintOrID getForegroundPaintOrID() const {
+        return fForeground;
+    }
     void setForegroundColor(SkPaint paint) {
         fHasForeground = true;
         fForeground = std::move(paint);
     }
+    // Set the foreground to a paint ID.  This is intended for use by clients
+    // that implement a custom ParagraphPainter that can not accept an SkPaint.
+    void setForegroundPaintID(ParagraphPainter::PaintID paintID) {
+        fHasForeground = true;
+        fForeground = paintID;
+    }
     void clearForegroundColor() { fHasForeground = false; }
 
     bool hasBackground() const { return fHasBackground; }
-    SkPaint getBackground() const { return fBackground; }
+    SkPaint getBackground() const {
+        const SkPaint* paint = std::get_if<SkPaint>(&fBackground);
+        return paint ? *paint : SkPaint();
+    }
+    ParagraphPainter::SkPaintOrID getBackgroundPaintOrID() const {
+        return fBackground;
+    }
     void setBackgroundColor(SkPaint paint) {
         fHasBackground = true;
         fBackground = std::move(paint);
     }
+    void setBackgroundPaintID(ParagraphPainter::PaintID paintID) {
+        fHasBackground = true;
+        fBackground = paintID;
+    }
     void clearBackgroundColor() { fHasBackground = false; }
 
     // Decorations
@@ -291,9 +314,9 @@ private:
 
     SkColor fColor = SK_ColorWHITE;
     bool fHasBackground = false;
-    SkPaint fBackground;
+    ParagraphPainter::SkPaintOrID fBackground;
     bool fHasForeground = false;
-    SkPaint fForeground;
+    ParagraphPainter::SkPaintOrID fForeground;
 
     std::vector<TextShadow> fTextShadows;
 

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

@@ -2,8 +2,8 @@
 #ifndef TypefaceFontProvider_DEFINED
 #define TypefaceFontProvider_DEFINED
 
-#include "include/private/SkTArray.h"
-#include "include/private/SkTHash.h"
+#include "include/private/base/SkTArray.h"
+#include "src/core/SkTHash.h"
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -20,15 +20,15 @@ public:
 
     int count() override;
     void getStyle(int index, SkFontStyle*, SkString* name) override;
-    SkTypeface* createTypeface(int index) override;
-    SkTypeface* matchStyle(const SkFontStyle& pattern) override;
+    sk_sp<SkTypeface> createTypeface(int index) override;
+    sk_sp<SkTypeface> matchStyle(const SkFontStyle& pattern) override;
 
     SkString getFamilyName() const { return fFamilyName; }
     SkString getAlias() const { return fAlias; }
     void appendTypeface(sk_sp<SkTypeface> typeface);
 
 private:
-    SkTArray<sk_sp<SkTypeface>> fStyles;
+    skia_private::TArray<sk_sp<SkTypeface>> fStyles;
     SkString fFamilyName;
     SkString fAlias;
 };
@@ -42,15 +42,15 @@ public:
 
     void onGetFamilyName(int index, SkString* familyName) const override;
 
-    SkFontStyleSet* onMatchFamily(const char familyName[]) const override;
+    sk_sp<SkFontStyleSet> onMatchFamily(const char familyName[]) const override;
 
-    SkFontStyleSet* onCreateStyleSet(int) const override { return nullptr; }
-    SkTypeface* onMatchFamilyStyle(const char[], const SkFontStyle&) const override {
+    sk_sp<SkFontStyleSet> onCreateStyleSet(int) const override { return nullptr; }
+    sk_sp<SkTypeface> onMatchFamilyStyle(const char[], const SkFontStyle&) const override {
         return nullptr;
     }
-    SkTypeface* onMatchFamilyStyleCharacter(const char[], const SkFontStyle&,
-                                            const char*[], int,
-                                            SkUnichar) const override {
+    sk_sp<SkTypeface> onMatchFamilyStyleCharacter(const char[], const SkFontStyle&,
+                                                  const char*[], int,
+                                                  SkUnichar) const override {
         return nullptr;
     }
 
@@ -71,8 +71,8 @@ public:
     }
 
 private:
-    SkTHashMap<SkString, sk_sp<TypefaceFontStyleSet>> fRegisteredFamilies;
-    SkTArray<SkString> fFamilyNames;
+    skia_private::THashMap<SkString, sk_sp<TypefaceFontStyleSet>> fRegisteredFamilies;
+    skia_private::TArray<SkString> fFamilyNames;
 };
 
 }  // namespace textlayout

package/cpp/skia/modules/skresources/include/SkResources.h

@@ -15,8 +15,8 @@
 #include "include/core/SkString.h"
 #include "include/core/SkTypeface.h"
 #include "include/core/SkTypes.h"
-#include "include/private/SkMutex.h"
-#include "include/private/SkTHash.h"
+#include "include/private/base/SkMutex.h"
+#include "src/core/SkTHash.h"
 
 #include <memory>
 
@@ -50,6 +50,18 @@ public:
      */
     virtual sk_sp<SkImage> getFrame(float t);
 
+    // Describes how the frame image is to be scaled to the animation-declared asset size.
+    enum class SizeFit {
+        // See SkMatrix::ScaleToFit
+        kFill   = SkMatrix::kFill_ScaleToFit,
+        kStart  = SkMatrix::kStart_ScaleToFit,
+        kCenter = SkMatrix::kCenter_ScaleToFit,
+        kEnd    = SkMatrix::kEnd_ScaleToFit,
+
+        // No scaling.
+        kNone,
+    };
+
     struct FrameData {
         // SkImage payload.
         sk_sp<SkImage>    image;
@@ -57,6 +69,8 @@ public:
         SkSamplingOptions sampling;
         // Additional image transform to be applied before AE scaling rules.
         SkMatrix          matrix = SkMatrix::I();
+        // Strategy for image size -> AE asset size scaling.
+        SizeFit           scaling = SizeFit::kCenter;
     };
 
     /**
@@ -227,8 +241,8 @@ private:
 
     sk_sp<ImageAsset> loadImageAsset(const char[], const char[], const char[]) const override;
 
-    mutable SkMutex                                 fMutex;
-    mutable SkTHashMap<SkString, sk_sp<ImageAsset>> fImageCache;
+    mutable SkMutex                                             fMutex;
+    mutable skia_private::THashMap<SkString, sk_sp<ImageAsset>> fImageCache;
 
     using INHERITED = ResourceProviderProxyBase;
 };

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

@@ -9,7 +9,7 @@
 #define SkSVGAttribute_DEFINED
 
 #include "modules/svg/include/SkSVGTypes.h"
-#include "src/core/SkTLazy.h"
+#include "src/base/SkTLazy.h"
 
 class SkSVGRenderContext;
 

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

@@ -10,9 +10,9 @@
 
 #include <vector>
 
-#include "include/private/SkNoncopyable.h"
+#include "include/private/base/SkNoncopyable.h"
 #include "modules/svg/include/SkSVGTypes.h"
-#include "src/core/SkTLazy.h"
+#include "src/base/SkTLazy.h"
 
 class SkSVGAttributeParser : public SkNoncopyable {
 public:

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

@@ -8,7 +8,7 @@
 #ifndef SkSVGContainer_DEFINED
 #define SkSVGContainer_DEFINED
 
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
 #include "modules/svg/include/SkSVGTransformableNode.h"
 
 class SkSVGContainer : public SkSVGTransformableNode {
@@ -27,7 +27,7 @@ protected:
     bool hasChildren() const final;
 
     // TODO: add some sort of child iterator, and hide the container.
-    SkSTArray<1, sk_sp<SkSVGNode>, true> fChildren;
+    skia_private::STArray<1, sk_sp<SkSVGNode>, true> fChildren;
 
 private:
     using INHERITED = SkSVGTransformableNode;

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

@@ -11,7 +11,7 @@
 #include "include/core/SkFontMgr.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSize.h"
-#include "include/private/SkTemplates.h"
+#include "include/private/base/SkTemplates.h"
 #include "modules/skresources/include/SkResources.h"
 #include "modules/svg/include/SkSVGIDMapper.h"
 

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

@@ -11,8 +11,8 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkString.h"
-#include "include/private/SkTHash.h"
 #include "modules/svg/include/SkSVGTypes.h"
+#include "src/core/SkTHash.h"
 
 class SkImageFilter;
 class SkSVGFeInputType;
@@ -61,7 +61,7 @@ private:
 
     SkSVGObjectBoundingBoxUnits fPrimitiveUnits;
 
-    SkTHashMap<SkSVGStringType, Result> fResults;
+    skia_private::THashMap<SkSVGStringType, Result> fResults;
 
     Result fPreviousResult;
 };

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

@@ -37,8 +37,8 @@ protected:
                                          SkTileMode, const SkMatrix& localMatrix) const = 0;
 
 private:
-    using StopPositionArray = SkSTArray<2, SkScalar , true>;
-    using    StopColorArray = SkSTArray<2, SkColor4f, true>;
+    using StopPositionArray = skia_private::STArray<2, SkScalar , true>;
+    using    StopColorArray = skia_private::STArray<2, SkColor4f, true>;
     void collectColorStops(const SkSVGRenderContext&, StopPositionArray*, StopColorArray*) const;
     SkColor4f resolveStopColor(const SkSVGRenderContext&, const SkSVGStop&) const;
 

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

@@ -9,11 +9,11 @@
 #define SkSVGIDMapper_DEFINED
 
 #include "include/core/SkRefCnt.h"
-#include "include/private/SkTHash.h"
+#include "src/core/SkTHash.h"
 
 class SkString;
 class SkSVGNode;
 
-using SkSVGIDMapper = SkTHashMap<SkString, sk_sp<SkSVGNode>>;
+using SkSVGIDMapper = skia_private::THashMap<SkString, sk_sp<SkSVGNode>>;
 
 #endif // SkSVGIDMapper_DEFINED