@shopify/react-native-skia 2.4.6 → 2.4.14

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

@@ -25,8 +25,10 @@
 #include <optional>
 #include <tuple>
 
+class SkPathData;
 class SkRRect;
 struct SkPathRaw;
+class SkString;
 
 class SK_API SkPathBuilder {
 public:
@@ -43,7 +45,7 @@ public:
         @param fillType  SkPathFillType to set on the SkPathBuilder.
         @return          empty SkPathBuilder
     */
-    SkPathBuilder(SkPathFillType fillType);
+    explicit SkPathBuilder(SkPathFillType fillType);
 
     /** Constructs an SkPathBuilder that is a copy of an existing SkPath.
         Copies the FillType and replays all of the verbs from the SkPath into the SkPathBuilder.
@@ -51,7 +53,7 @@ public:
         @param path  SkPath to copy
         @return      SkPathBuilder
     */
-    SkPathBuilder(const SkPath& path);
+    explicit SkPathBuilder(const SkPath& path);
 
     SkPathBuilder(const SkPathBuilder&) = default;
     ~SkPathBuilder();
@@ -63,9 +65,11 @@ public:
         @return      SkPathBuilder
     */
     SkPathBuilder& operator=(const SkPath&);
-
     SkPathBuilder& operator=(const SkPathBuilder&) = default;
 
+    bool operator==(const SkPathBuilder&) const;
+    bool operator!=(const SkPathBuilder& o) const { return !(*this == o); }
+
     /** Returns SkPathFillType, the rule used to fill SkPath.
 
         @return  current SkPathFillType setting
@@ -73,15 +77,32 @@ public:
     SkPathFillType fillType() const { return fFillType; }
 
     /** Returns minimum and maximum axes values of SkPoint array.
-        Returns (0, 0, 0, 0) if SkPathBuilder contains no points. Returned bounds width and height
-        may be larger or smaller than area affected when SkPath is drawn.
+        Returns (0, 0, 0, 0) if SkPathBuilder contains no points.
 
         SkRect returned includes all SkPoint added to SkPathBuilder, including SkPoint associated
         with kMove_Verb that define empty contours.
 
-        @return  bounds of all SkPoint in SkPoint array
+        If any of the points are non-finite, returns {}.
+
+        @return  bounds of all SkPoint in SkPoint array, or {}.
     */
-    SkRect computeBounds() const;
+    std::optional<SkRect> computeFiniteBounds() const {
+        return SkRect::Bounds(fPts);
+    }
+
+    /** Like computeFiniteBounds() but returns a 'tight' bounds, meaning when there are curve
+     *  segments, this computes the X/Y limits of the curve itself, not the curve's control
+     *  point(s). For a polygon, this returns the same as computeFiniteBounds().
+    */
+    std::optional<SkRect> computeTightBounds() const;
+
+    // DEPRECATED -- returns "empty" if the bounds are non-finite
+    SkRect computeBounds() const {
+        if (auto bounds = this->computeFiniteBounds()) {
+            return *bounds;
+        }
+        return SkRect::MakeEmpty();
+    }
 
     /** Returns an SkPath representing the current state of the SkPathBuilder. The builder is
         unchanged after returning the path.
@@ -99,6 +120,9 @@ public:
      */
     SkPath detach(const SkMatrix* mx = nullptr);
 
+    sk_sp<SkPathData> snapshotData() const;
+    sk_sp<SkPathData> detachData();
+
     /** Sets SkPathFillType, the rule used to fill SkPath. While there is no
         check that ft is legal, values outside of SkPathFillType are not supported.
 
@@ -127,7 +151,7 @@ public:
 
     /** Sets SkPathBuilder to its initial state.
         Removes verb array, SkPoint array, and weights, and sets FillType to kWinding.
-        Internal storage associated with SkPathBuilder is released.
+        Internal storage associated with SkPathBuilder is preserved.
 
         @return  reference to SkPathBuilder
     */
@@ -367,7 +391,20 @@ public:
 
         example: https://fiddle.skia.org/c/@Path_rMoveTo
     */
-    SkPathBuilder& rMoveTo(SkPoint pt);
+    SkPathBuilder& rMoveTo(SkVector pt);
+
+    /** Adds beginning of contour relative to last point.
+        If SkPathBuilder is empty, starts contour at (dx, dy).
+        Otherwise, start contour at last point offset by (dx, dy).
+        Function name stands for "relative move to".
+
+        @param dx  offset from last point to contour start on x-axis
+        @param dy  offset from last point to contour start on y-axis
+        @return    reference to SkPathBuilder
+
+        example: https://fiddle.skia.org/c/@Path_rMoveTo
+    */
+    SkPathBuilder& rMoveTo(SkScalar dx, SkScalar dy) { return this->rMoveTo({dx, dy}); }
 
     /** Adds line from last point to vector given by pt. If SkPathBuilder is empty, or last
         SkPath::Verb is kClose_Verb, last point is set to (0, 0) before adding line.
@@ -380,7 +417,7 @@ public:
         @param pt  vector offset from last point to line end
         @return    reference to SkPathBuilder
     */
-    SkPathBuilder& rLineTo(SkPoint pt);
+    SkPathBuilder& rLineTo(SkVector pt);
 
     /** Adds line from last point to vector (dx, dy). If SkPathBuilder is empty, or last
         SkPath::Verb is kClose_Verb, last point is set to (0, 0) before adding line.
@@ -394,7 +431,7 @@ public:
         @param dy  offset from last point to line end on y-axis
         @return    reference to SkPathBuilder
     */
-    SkPathBuilder& rLineTo(SkScalar x, SkScalar y) { return this->rLineTo({x, y}); }
+    SkPathBuilder& rLineTo(SkScalar dx, SkScalar dy) { return this->rLineTo({dx, dy}); }
 
     /** Adds quad from last point towards vector pt1, to vector pt2.
         If SkPathBuilder is empty, or last SkPath::Verb
@@ -411,7 +448,7 @@ public:
         @param pt2  offset vector from last point to quad end
         @return     reference to SkPathBuilder
     */
-    SkPathBuilder& rQuadTo(SkPoint pt1, SkPoint pt2);
+    SkPathBuilder& rQuadTo(SkVector pt1, SkVector pt2);
 
     /** Adds quad from last point towards vector (dx1, dy1), to vector (dx2, dy2).
         If SkPathBuilder is empty, or last SkPath::Verb
@@ -430,8 +467,8 @@ public:
         @param dy2  offset from last point to quad end on y-axis
         @return     reference to SkPathBuilder
     */
-    SkPathBuilder& rQuadTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2) {
-        return this->rQuadTo({x1, y1}, {x2, y2});
+    SkPathBuilder& rQuadTo(SkScalar dx1, SkScalar dy1, SkScalar dx2, SkScalar dy2) {
+        return this->rQuadTo({dx1, dy1}, {dx2, dy2});
     }
 
     /** Adds conic from last point towards vector p1, to vector p2,
@@ -457,7 +494,7 @@ public:
         @param w   weight of added conic
         @return    reference to SkPathBuilder
     */
-    SkPathBuilder& rConicTo(SkPoint p1, SkPoint p2, SkScalar w);
+    SkPathBuilder& rConicTo(SkVector p1, SkVector p2, SkScalar w);
 
     /** Adds conic from last point towards vector (dx1, dy1), to vector (dx2, dy2),
         weighted by w. If SkPathBuilder is empty, or last SkPath::Verb
@@ -484,8 +521,8 @@ public:
         @param w    weight of added conic
         @return     reference to SkPathBuilder
     */
-    SkPathBuilder& rConicTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2, SkScalar w) {
-        return this->rConicTo({x1, y1}, {x2, y2}, w);
+    SkPathBuilder& rConicTo(SkScalar dx1, SkScalar dy1, SkScalar dx2, SkScalar dy2, SkScalar w) {
+        return this->rConicTo({dx1, dy1}, {dx2, dy2}, w);
     }
 
     /** Adds cubic from last point towards vector pt1, then towards
@@ -505,7 +542,7 @@ public:
         @param pt3  offset vector from last point to cubic end
         @return    reference to SkPathBuilder
     */
-    SkPathBuilder& rCubicTo(SkPoint pt1, SkPoint pt2, SkPoint pt3);
+    SkPathBuilder& rCubicTo(SkVector pt1, SkVector pt2, SkVector pt3);
 
     /** Adds cubic from last point towards vector (dx1, dy1), then towards
         vector (dx2, dy2), to vector (dx3, dy3).
@@ -527,10 +564,14 @@ public:
         @param dy3  offset from last point to cubic end on y-axis
         @return    reference to SkPathBuilder
     */
-    SkPathBuilder& rCubicTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2, SkScalar x3, SkScalar y3) {
-        return this->rCubicTo({x1, y1}, {x2, y2}, {x3, y3});
+    SkPathBuilder& rCubicTo(SkScalar dx1, SkScalar dy1,
+                            SkScalar dx2, SkScalar dy2,
+                            SkScalar dx3, SkScalar dy3) {
+        return this->rCubicTo({dx1, dy1}, {dx2, dy2}, {dx3, dy3});
     }
 
+    // Arcs
+
     enum ArcSize {
         kSmall_ArcSize, //!< smaller of arc pair
         kLarge_ArcSize, //!< larger of arc pair
@@ -553,19 +594,15 @@ public:
         opposite the integer value of sweep; SVG "sweep-flag" uses 1 for clockwise, while
         kCW_Direction cast to int is zero.
 
-        @param rx           radius before x-axis rotation
-        @param ry           radius before x-axis rotation
+        @param r            radii on axes before x-axis rotation
         @param xAxisRotate  x-axis rotation in degrees; positive values are clockwise
         @param largeArc     chooses smaller or larger arc
         @param sweep        chooses clockwise or counterclockwise arc
-        @param dx           x-axis offset end of arc from last SkPath SkPoint
-        @param dy           y-axis offset end of arc from last SkPath SkPoint
+        @param dxdy         offset end of arc from last SkPath point
         @return             reference to SkPath
     */
-    SkPathBuilder& rArcTo(SkScalar rx, SkScalar ry, SkScalar xAxisRotate, ArcSize largeArc,
-                          SkPathDirection sweep, SkScalar dx, SkScalar dy);
-
-    // Arcs
+    SkPathBuilder& rArcTo(SkPoint r, SkScalar xAxisRotate, ArcSize largeArc,
+                          SkPathDirection sweep, SkVector dxdy);
 
     /** Appends arc to the builder. Arc added is part of ellipse
         bounded by oval, from startAngle through sweepAngle. Both startAngle and
@@ -805,9 +842,7 @@ public:
     */
     SkPathBuilder& addPath(const SkPath& src,
                            SkPath::AddPathMode mode = SkPath::kAppend_AddPathMode) {
-        SkMatrix m;
-        m.reset();
-        return this->addPath(src, m, mode);
+        return this->addPath(src, SkMatrix::I(), mode);
     }
 
     /** Appends src to SkPathBuilder, transformed by matrix. Transformed curves may have different
@@ -831,10 +866,11 @@ public:
         May improve performance and use less memory by
         reducing the number and size of allocations when creating SkPathBuilder.
 
-        @param extraPtCount    number of additional SkPoint to allocate
-        @param extraVerbCount  number of additional verbs
+        @param extraPtCount     number of additional SkPoint to allocate
+        @param extraVerbCount   number of additional verbs
+        @param extraConicCount  number of additional conic weights
     */
-    void incReserve(int extraPtCount, int extraVerbCount);
+    void incReserve(int extraPtCount, int extraVerbCount, int extraConicCount);
 
     /** Grows SkPathBuilder verb array and SkPoint array to contain additional space.
         May improve performance and use less memory by
@@ -843,7 +879,7 @@ public:
         @param extraPtCount    number of additional SkPoints and verbs to allocate
     */
     void incReserve(int extraPtCount) {
-        this->incReserve(extraPtCount, extraPtCount);
+        this->incReserve(extraPtCount, extraPtCount, 0);
     }
 
     /** Offsets SkPoint array by (dx, dy).
@@ -861,12 +897,6 @@ public:
     */
     SkPathBuilder& transform(const SkMatrix& matrix);
 
-#ifdef SK_SUPPORT_LEGACY_APPLYPERSPECTIVECLIP
-    SkPathBuilder& transform(const SkMatrix& matrix, SkApplyPerspectiveClip) {
-        return this->transform(matrix);
-    }
-#endif
-
     /*
      *  Returns true if the builder is empty, or all of its points are finite.
      */
@@ -876,7 +906,7 @@ public:
         unmodified by the original SkPathFillType.
     */
     SkPathBuilder& toggleInverseFillType() {
-        fFillType = (SkPathFillType)((unsigned)fFillType ^ 2);
+        fFillType = SkPathFillType_ToggleInverse(fFillType);
         return *this;
     }
 
@@ -896,6 +926,14 @@ public:
     */
     std::optional<SkPoint> getLastPt() const;
 
+    /** Change the point at the specified index (see countPoints()).
+     *  If index is out of range, the call does nothing.
+     *
+     *  @param index which point to replace
+     *  @param p the new point value
+     */
+    void setPoint(size_t index, SkPoint p);
+
     /** Sets the last point on the path. If SkPoint array is empty, append kMove_Verb to
         verb array and append p to SkPoint array.
 
@@ -941,6 +979,18 @@ public:
 
     SkPathIter iter() const;
 
+    enum class DumpFormat {
+        kDecimal,
+        kHex,
+    };
+    SkString dumpToString(DumpFormat = DumpFormat::kDecimal) const;
+    void dump(DumpFormat) const;
+    // can't use default argument easily in debugger, so we name this
+    // helper explicitly.
+    void dump() const { this->dump(DumpFormat::kDecimal); }
+
+    bool contains(SkPoint) const;
+
 private:
     SkPathRef::PointsArray fPts;
     SkPathRef::VerbsArray fVerbs;
@@ -951,9 +1001,7 @@ private:
     SkPathConvexity fConvexity;
 
     unsigned    fSegmentMask;
-    SkPoint     fLastMovePoint;
     int         fLastMoveIndex; // only needed until SkPath is immutable
-    bool        fNeedsMoveVerb;
 
     SkPathIsAType fType = SkPathIsAType::kGeneral;
     SkPathIsAData fIsA {};
@@ -961,8 +1009,10 @@ private:
     // called right before we add a (non-move) verb
     void ensureMove() {
         fType = SkPathIsAType::kGeneral;
-        if (fNeedsMoveVerb) {
-            this->moveTo(fLastMovePoint);
+        if (fVerbs.empty()) {
+            this->moveTo({0, 0});
+        } else if (fVerbs.back() == SkPathVerb::kClose) {
+            this->moveTo(fPts[fLastMoveIndex]);
         }
     }
 
@@ -973,7 +1023,7 @@ private:
     SkPathBuilder& privateReverseAddPath(const SkPath&);
     SkPathBuilder& privateReversePathTo(const SkPath&);
 
-    std::tuple<SkPoint*, SkScalar*> growForVerbsInPath(const SkPathRef& path);
+    std::tuple<SkPoint*, SkScalar*> growForVerbsInPath(const SkPath& path);
 
     friend class SkPathPriv;
     friend class SkStroke;

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

@@ -33,6 +33,10 @@ static inline bool SkPathFillType_IsInverse(SkPathFillType ft) {
     return (static_cast<int>(ft) & 2) != 0;
 }
 
+static inline SkPathFillType SkPathFillType_ToggleInverse(SkPathFillType ft) {
+    return static_cast<SkPathFillType>(static_cast<int>(ft) ^ 2);
+}
+
 static inline SkPathFillType SkPathFillType_ConvertToNonInverse(SkPathFillType ft) {
     return static_cast<SkPathFillType>(static_cast<int>(ft) & 1);
 }
@@ -59,7 +63,9 @@ enum class SkPathVerb : uint8_t {
     kQuad,   //!< SkPath::RawIter returns 3 points
     kConic,  //!< SkPath::RawIter returns 3 points + 1 weight
     kCubic,  //!< SkPath::RawIter returns 4 points
-    kClose   //!< SkPath::RawIter returns 0 points
+    kClose,  //!< SkPath::RawIter returns 0 points
+
+    kLast_Verb = kClose,
 };
 
 #endif

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

@@ -396,8 +396,8 @@ public:
         @return   readable unsigned 8-bit pointer to pixel at (x, y)
     */
     const uint8_t* addr8(int x, int y) const {
-        SkASSERT((unsigned)x < (unsigned)fInfo.width());
-        SkASSERT((unsigned)y < (unsigned)fInfo.height());
+        SkASSERTF(x >= 0 && x < this->width(), "x=%d; width=%d\n", x, fInfo.width());
+        SkASSERTF(y >= 0 && y < this->height(), "y=%d; height=%d\n", y, fInfo.height());
         return (const uint8_t*)((const char*)this->addr8() + (size_t)y * fRowBytes + (x << 0));
     }
 
@@ -414,8 +414,8 @@ public:
         @return   readable unsigned 16-bit pointer to pixel at (x, y)
     */
     const uint16_t* addr16(int x, int y) const {
-        SkASSERT((unsigned)x < (unsigned)fInfo.width());
-        SkASSERT((unsigned)y < (unsigned)fInfo.height());
+        SkASSERTF(x >= 0 && x < this->width(), "x=%d; width=%d\n", x, fInfo.width());
+        SkASSERTF(y >= 0 && y < this->height(), "y=%d; height=%d\n", y, fInfo.height());
         return (const uint16_t*)((const char*)this->addr16() + (size_t)y * fRowBytes + (x << 1));
     }
 
@@ -432,8 +432,8 @@ public:
         @return   readable unsigned 32-bit pointer to pixel at (x, y)
     */
     const uint32_t* addr32(int x, int y) const {
-        SkASSERT((unsigned)x < (unsigned)fInfo.width());
-        SkASSERT((unsigned)y < (unsigned)fInfo.height());
+        SkASSERTF(x >= 0 && x < this->width(), "x=%d; width=%d\n", x, fInfo.width());
+        SkASSERTF(y >= 0 && y < this->height(), "y=%d; height=%d\n", y, fInfo.height());
         return (const uint32_t*)((const char*)this->addr32() + (size_t)y * fRowBytes + (x << 2));
     }
 
@@ -450,8 +450,8 @@ public:
         @return   readable unsigned 64-bit pointer to pixel at (x, y)
     */
     const uint64_t* addr64(int x, int y) const {
-        SkASSERT((unsigned)x < (unsigned)fInfo.width());
-        SkASSERT((unsigned)y < (unsigned)fInfo.height());
+        SkASSERTF(x >= 0 && x < this->width(), "x=%d; width=%d\n", x, fInfo.width());
+        SkASSERTF(y >= 0 && y < this->height(), "y=%d; height=%d\n", y, fInfo.height());
         return (const uint64_t*)((const char*)this->addr64() + (size_t)y * fRowBytes + (x << 3));
     }
 

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

@@ -156,7 +156,7 @@ public:
         return rr;
     }
 
-    /** Sets bounds to oval, x-axis radii to half oval.width(), and all y-axis radii
+    /** Initializes to oval, x-axis radii to half oval.width(), and all y-axis radii
         to half oval.height(). If oval bounds is empty, sets to kEmpty_Type.
         Otherwise, sets to kOval_Type.
 
@@ -169,7 +169,7 @@ public:
         return rr;
     }
 
-    /** Sets to rounded rectangle with the same radii for all four corners.
+    /** Initializes to rounded rectangle with the same radii for all four corners.
         If rect is empty, sets to kEmpty_Type.
         Otherwise, if xRad and yRad are zero, sets to kRect_Type.
         Otherwise, if xRad is at least half rect.width() and yRad is at least half
@@ -187,6 +187,27 @@ public:
         return rr;
     }
 
+    /** Initializes to rounded rectangle with a radii array for individual control
+        of all four corners.
+
+        If rect is empty, sets to kEmpty_Type.
+        Otherwise, if one of each corner radii are zero, sets to kRect_Type.
+        Otherwise, if all x-axis radii are equal and at least half rect.width(), and
+        all y-axis radii are equal at least half rect.height(), sets to kOval_Type.
+        Otherwise, if all x-axis radii are equal, and all y-axis radii are equal,
+        sets to kSimple_Type. Otherwise, sets to kNinePatch_Type.
+
+        @param rect   bounds of rounded rectangle
+        @param radii  corner x-axis and y-axis radii
+
+        example: https://fiddle.skia.org/c/@RRect_setRectRadii
+    */
+    static SkRRect MakeRectRadii(const SkRect& rect, const SkVector radii[4]) {
+        SkRRect rr;
+        rr.setRectRadii(rect, radii);
+        return rr;
+    }
+
     /** Sets bounds to oval, x-axis radii to half oval.width(), and all y-axis radii
         to half oval.height(). If oval bounds is empty, sets to kEmpty_Type.
         Otherwise, sets to kOval_Type.
@@ -233,7 +254,7 @@ public:
     void setNinePatch(const SkRect& rect, SkScalar leftRad, SkScalar topRad,
                       SkScalar rightRad, SkScalar bottomRad);
 
-    /** Sets bounds to rect. Sets radii array for individual control of all for corners.
+    /** Sets bounds to rect. Sets radii array for individual control of all four corners.
 
         If rect is empty, sets to kEmpty_Type.
         Otherwise, if one of each corner radii are zero, sets to kRect_Type.

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

@@ -10,6 +10,7 @@
 #include "include/private/base/SkAPI.h"
 
 class SkCanvas;
+class SkSurface;
 
 namespace skcpu {
 class Recorder;
@@ -40,8 +41,9 @@ private:
     * Returns nullptr if capture is not enabled.
     */
     virtual SkCanvas* makeCaptureCanvas(SkCanvas*) = 0;
+    virtual void createCaptureBreakpoint(SkSurface*) = 0;
 
-    friend class SkSurface_Base;
+    friend class SkSurface_Base; // for capture functionality
 };
 
 #endif

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

@@ -71,8 +71,8 @@ static inline SkScalar SkScalarFraction(SkScalar x) {
 static inline SkScalar SkScalarSquare(SkScalar x) { return x * x; }
 
 #define SkScalarInvert(x)           (SK_Scalar1 / (x))
-#define SkScalarAve(a, b)           (((a) + (b)) * SK_ScalarHalf)
 #define SkScalarHalf(a)             ((a) * SK_ScalarHalf)
+#define SkScalarAve(a, b)           sk_float_midpoint(a, b)
 
 #define SkDegreesToRadians(degrees) ((degrees) * (SK_ScalarPI / 180))
 #define SkRadiansToDegrees(radians) ((radians) * (180 / SK_ScalarPI))

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

@@ -24,6 +24,11 @@ namespace sktext::gpu {
     class Slug;
 }
 
+#if defined(SK_DISABLE_LEGACY_NONCONST_SERIAL_PROCS)
+using SkSerialReturnType = sk_sp<const SkData>;
+#else
+using SkSerialReturnType = sk_sp<SkData>;
+#endif
 /**
  *  A serial-proc is asked to serialize the specified object (e.g. picture or image).
  *  If a data object is returned, it will be used (even if it is zero-length).
@@ -33,10 +38,9 @@ namespace sktext::gpu {
  *  The default action for images is to encode either in its native format or PNG.
  *  The default action for typefaces is to use Skia's internal format.
  */
-
-using SkSerialPictureProc = sk_sp<SkData> (*)(SkPicture*, void* ctx);
-using SkSerialImageProc = sk_sp<SkData> (*)(SkImage*, void* ctx);
-using SkSerialTypefaceProc = sk_sp<SkData> (*)(SkTypeface*, void* ctx);
+using SkSerialPictureProc = SkSerialReturnType (*)(SkPicture*, void* ctx);
+using SkSerialImageProc = SkSerialReturnType (*)(SkImage*, void* ctx);
+using SkSerialTypefaceProc = SkSerialReturnType (*)(SkTypeface*, void* ctx);
 
 /**
  *  Called with the encoded form of a picture (previously written with a custom

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

@@ -20,6 +20,8 @@
 #include <cstring>
 #include <memory>
 #include <utility>
+#include <vector>
+
 class SkStreamAsset;
 
 /**
@@ -141,7 +143,7 @@ public:
 //SkStreamMemory
     /** Returns the starting address for the data. If this cannot be done, returns NULL. */
     virtual const void* getMemoryBase() { return nullptr; }
-    virtual sk_sp<SkData> getData() const { return nullptr; }
+    virtual sk_sp<const SkData> getData() const { return nullptr; }
 
 private:
     virtual SkStream* onDuplicate() const { return nullptr; }
@@ -363,18 +365,19 @@ private:
     using INHERITED = SkStreamAsset;
 };
 
+// A read only view into a block of memory.
 class SK_API SkMemoryStream : public SkStreamMemory {
 public:
     SkMemoryStream();
 
     /** We allocate (and free) the memory. Write to it via getMemoryBase() */
-    SkMemoryStream(size_t length);
+    explicit SkMemoryStream(size_t length);
 
     /** If copyData is true, the stream makes a private copy of the data. */
     SkMemoryStream(const void* data, size_t length, bool copyData = false);
 
     /** Creates the stream to read from the specified data */
-    SkMemoryStream(sk_sp<SkData> data);
+    explicit SkMemoryStream(sk_sp<const SkData> data);
 
     /** Returns a stream with a copy of the input data. */
     static std::unique_ptr<SkMemoryStream> MakeCopy(const void* data, size_t length);
@@ -383,7 +386,7 @@ public:
     static std::unique_ptr<SkMemoryStream> MakeDirect(const void* data, size_t length);
 
     /** Returns a stream with a shared reference to the input data. */
-    static std::unique_ptr<SkMemoryStream> Make(sk_sp<SkData> data);
+    static std::unique_ptr<SkMemoryStream> Make(sk_sp<const SkData> data);
 
     /** Resets the stream to the specified data and length,
         just like the constructor.
@@ -397,8 +400,9 @@ public:
     */
     void setMemoryOwned(const void* data, size_t length);
 
-    sk_sp<SkData> getData() const override { return fData; }
-    void setData(sk_sp<SkData> data);
+    sk_sp<const SkData> getData() const override { return fData; }
+
+    void setData(sk_sp<const SkData> data);
 
     const void* getAtPos();
 
@@ -429,8 +433,8 @@ private:
     SkMemoryStream* onDuplicate() const override;
     SkMemoryStream* onFork() const override;
 
-    sk_sp<SkData>   fData;
-    size_t          fOffset;
+    sk_sp<const SkData> fData;
+    size_t fOffset;
 
     using INHERITED = SkStreamMemory;
 };
@@ -439,7 +443,7 @@ private:
 
 class SK_API SkFILEWStream : public SkWStream {
 public:
-    SkFILEWStream(const char path[]);
+    explicit SkFILEWStream(const char path[]);
     ~SkFILEWStream() override;
 
     /** Returns true if the current path could be opened.
@@ -489,6 +493,9 @@ public:
     /** Return the contents as SkData, and then reset the stream. */
     sk_sp<SkData> detachAsData();
 
+    /** Return the contents as vector, and then reset the stream. */
+    std::vector<uint8_t> detachAsVector();
+
     /** Reset, returning a reader stream with the current content. */
     std::unique_ptr<SkStreamAsset> detachAsStream();
 

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

@@ -237,7 +237,7 @@ public:
 
     SkString& operator+=(const SkString& s) { this->append(s); return *this; }
     SkString& operator+=(const char text[]) { this->append(text); return *this; }
-    SkString& operator+=(const char c) { this->append(&c, 1); return *this; }
+    SkString& operator+=(char c) { this->append(&c, 1); return *this; }
 
     /**
      *  Swap contents between this and other. This function is guaranteed

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

@@ -26,7 +26,7 @@ public:
         kHairline_InitStyle,
         kFill_InitStyle
     };
-    SkStrokeRec(InitStyle style);
+    explicit SkStrokeRec(InitStyle style);
     SkStrokeRec(const SkPaint&, SkPaint::Style, SkScalar resScale = 1);
     explicit SkStrokeRec(const SkPaint&, SkScalar resScale = 1);
 

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

@@ -181,6 +181,9 @@ public:
     SkMatrix originMatrix() const {
         return SkEncodedOriginToMatrix(fOrigin, this->width(), this->height());
     }
+    SkMatrix inverseOriginMatrix() const {
+        return SkEncodedOriginToMatrixInverse(fOrigin, this->width(), this->height());
+    }
 
     bool hasAlpha() const { return HasAlpha(fPlaneConfig); }
 

package/cpp/skia/include/docs/SkPDFDocument.h

@@ -83,7 +83,7 @@ struct DateTime {
     void toISO8601(SkString* dst) const;
 };
 
-using DecodeJpegCallback = std::unique_ptr<SkCodec> (*)(sk_sp<SkData>);
+using DecodeJpegCallback = std::unique_ptr<SkCodec> (*)(sk_sp<const SkData>);
 using EncodeJpegCallback = bool (*)(SkWStream* dst, const SkPixmap& src, int quality);
 
 /** Optional metadata to be passed into the PDF factory function.

package/cpp/skia/include/docs/SkPDFJpegHelpers.h

@@ -19,7 +19,7 @@ class SkWStream;
 #include <memory>
 
 namespace SkPDF::JPEG {
-inline std::unique_ptr<SkCodec> Decode(sk_sp<SkData> data) {
+inline std::unique_ptr<SkCodec> Decode(sk_sp<const SkData> data) {
     return SkJpegDecoder::Decode(data, nullptr, nullptr);
 }