@shopify/react-native-skia 2.5.5 → 2.6.1

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

@@ -33,28 +33,13 @@ class SkWStream;
 enum class SkPathConvexity;
 enum class SkResolveConvexity;
 struct SkPathRaw;
-struct SkPathVerbAnalysis;
 struct SkPathOvalInfo;
 struct SkPathRRectInfo;
 
-// WIP -- define this locally, and fix call-sites to use SkPathBuilder (skbug.com/40040287)
-#ifndef SK_HIDE_PATH_EDIT_METHODS
-//#define SK_HIDE_PATH_EDIT_METHODS
-#endif
-
 // Migrate clients so this is unneeded
 #define SK_LEGACY_PATH_ACCESSORS
 
-#ifdef SK_HIDE_PATH_EDIT_METHODS
-    // enable this to try using SkPathData
-    #define SK_PATH_USES_PATHDATA
-#endif
-
-#ifdef SK_PATH_USES_PATHDATA
 class SkPathData;
-#else
-class SkPathRef;
-#endif
 
 /** \class SkPath
     SkPath contain geometry. SkPath may be empty, or contain one or more verbs that
@@ -157,7 +142,8 @@ public:
 
         example: https://fiddle.skia.org/c/@Path_copy_const_SkPath
     */
-    SkPath(const SkPath& path);
+    SkPath(const SkPath&);
+    SkPath(SkPath&&);
 
     /** Releases ownership of any shared data and deletes data if SkPath is sole owner.
 
@@ -184,7 +170,8 @@ public:
 
         example: https://fiddle.skia.org/c/@Path_copy_operator
     */
-    SkPath& operator=(const SkPath& path);
+    SkPath& operator=(const SkPath&);
+    SkPath& operator=(SkPath&&);
 
     /** Compares a and b; returns true if SkPath::FillType, verb array, SkPoint array, and weights
         are equivalent.
@@ -511,14 +498,15 @@ public:
     */
     size_t approximateBytesUsed() const;
 
-    /** Returns minimum and maximum axes values of SkPoint array.
-        Returns (0, 0, 0, 0) if SkPath contains no points. Returned bounds width and height may
-        be larger or smaller than area affected when SkPath is drawn.
+    /** Returns the min/max of the path's 'trimmed' points. The trimmed points are all of the
+        points in the path, with the exception of the path having more than one contour, and the
+        final contour containing only a kMove verb. In that case the trailing kMove point
+        is ignored when computing the bounds.
 
-        SkRect returned includes all SkPoint added to SkPath, including SkPoint associated with
-        kMove_Verb that define empty contours.
+        If the path has no verbs, or the path contains non-finite values,
+        then {0, 0, 0, 0} is returned. (see isFinite())
 
-        @return  bounds of all SkPoint in SkPoint array
+        @return  bounds of the path's points
     */
     const SkRect& getBounds() const;
 
@@ -569,15 +557,6 @@ public:
     */
     bool conservativelyContainsRect(const SkRect& rect) const;
 
-    /** \enum SkPath::ArcSize
-        Four oval parts with radii (rx, ry) start at last SkPath SkPoint and ends at (x, y).
-        ArcSize and Direction select one of the four oval parts.
-    */
-    enum ArcSize {
-        kSmall_ArcSize, //!< smaller of arc pair
-        kLarge_ArcSize, //!< larger of arc pair
-    };
-
     /** Approximates conic with quad array. Conic is constructed from start SkPoint p0,
         control SkPoint p1, end SkPoint p2, and weight w.
         Quad array is stored in pts; this storage is supplied by caller.
@@ -779,810 +758,6 @@ public:
     */
     SkPath& reset();
 
-#ifndef SK_HIDE_PATH_EDIT_METHODS
-    /** Returns a copy of this path in the current state, and resets the path to empty. */
-    SkPath detach() {
-        SkPath result = *this;
-        this->reset();
-        return result;
-    }
-
-    /** Sets SkPath to its initial state, preserving internal storage.
-        Removes verb array, SkPoint array, and weights, and sets FillType to kWinding.
-        Internal storage associated with SkPath is retained.
-
-        Use rewind() instead of reset() if SkPath storage will be reused and performance
-        is critical.
-
-        @return  reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_rewind
-    */
-    SkPath& rewind();
-
-    /** Grows SkPath verb array, SkPoint array, and conics to contain additional space.
-        May improve performance and use less memory by
-        reducing the number and size of allocations when creating SkPath.
-
-        @param extraPtCount  number of additional SkPoint to allocate
-        @param extraVerbCount  number of additional verbs
-        @param extraConicCount  number of additional conics
-
-        example: https://fiddle.skia.org/c/@Path_incReserve
-    */
-    void incReserve(int extraPtCount, int extraVerbCount = 0, int extraConicCount = 0);
-
-    /** Specifies the beginning of contour. If the previous verb was a "move" verb,
-     *  then this just replaces the point value of that move, otherwise it appends a new
-     *  "move" verb to the path using the point.
-     *
-     *  Thus, each contour can only have 1 move verb in it (the last one specified).
-     */
-    SkPath& moveTo(SkPoint p) {
-        return this->moveTo(p.fX, p.fY);
-    }
-    SkPath& moveTo(SkScalar x, SkScalar y);
-
-    /** Adds beginning of contour relative to last point.
-        If SkPath 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 SkPath
-
-        example: https://fiddle.skia.org/c/@Path_rMoveTo
-    */
-    SkPath& rMoveTo(SkScalar dx, SkScalar dy);
-
-    /** Adds line from last point to (x, y). If SkPath is empty, or last SkPath::Verb is
-        kClose_Verb, last point is set to (0, 0) before adding line.
-
-        lineTo() appends kMove_Verb to verb array and (0, 0) to SkPoint array, if needed.
-        lineTo() then appends kLine_Verb to verb array and (x, y) to SkPoint array.
-
-        @param x  end of added line on x-axis
-        @param y  end of added line on y-axis
-        @return   reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_lineTo
-    */
-    SkPath& lineTo(SkScalar x, SkScalar y);
-
-    /** Adds line from last point to SkPoint p. If SkPath is empty, or last SkPath::Verb is
-        kClose_Verb, last point is set to (0, 0) before adding line.
-
-        lineTo() first appends kMove_Verb to verb array and (0, 0) to SkPoint array, if needed.
-        lineTo() then appends kLine_Verb to verb array and SkPoint p to SkPoint array.
-
-        @param p  end SkPoint of added line
-        @return   reference to SkPath
-    */
-    SkPath& lineTo(const SkPoint& p) {
-        return this->lineTo(p.fX, p.fY);
-    }
-
-    /** Adds line from last point to vector (dx, dy). If SkPath is empty, or last SkPath::Verb is
-        kClose_Verb, last point is set to (0, 0) before adding line.
-
-        Appends kMove_Verb to verb array and (0, 0) to SkPoint array, if needed;
-        then appends kLine_Verb to verb array and line end to SkPoint array.
-        Line end is last point plus vector (dx, dy).
-        Function name stands for "relative line to".
-
-        @param dx  offset from last point to line end on x-axis
-        @param dy  offset from last point to line end on y-axis
-        @return    reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_rLineTo
-        example: https://fiddle.skia.org/c/@Quad_a
-        example: https://fiddle.skia.org/c/@Quad_b
-    */
-    SkPath& rLineTo(SkScalar dx, SkScalar dy);
-
-    /** Adds quad from last point towards (x1, y1), to (x2, y2).
-        If SkPath is empty, or last SkPath::Verb is kClose_Verb, last point is set to (0, 0)
-        before adding quad.
-
-        Appends kMove_Verb to verb array and (0, 0) to SkPoint array, if needed;
-        then appends kQuad_Verb to verb array; and (x1, y1), (x2, y2)
-        to SkPoint array.
-
-        @param x1  control SkPoint of quad on x-axis
-        @param y1  control SkPoint of quad on y-axis
-        @param x2  end SkPoint of quad on x-axis
-        @param y2  end SkPoint of quad on y-axis
-        @return    reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_quadTo
-    */
-    SkPath& quadTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2);
-
-    /** Adds quad from last point towards SkPoint p1, to SkPoint p2.
-        If SkPath is empty, or last SkPath::Verb is kClose_Verb, last point is set to (0, 0)
-        before adding quad.
-
-        Appends kMove_Verb to verb array and (0, 0) to SkPoint array, if needed;
-        then appends kQuad_Verb to verb array; and SkPoint p1, p2
-        to SkPoint array.
-
-        @param p1  control SkPoint of added quad
-        @param p2  end SkPoint of added quad
-        @return    reference to SkPath
-    */
-    SkPath& quadTo(const SkPoint& p1, const SkPoint& p2) {
-        return this->quadTo(p1.fX, p1.fY, p2.fX, p2.fY);
-    }
-
-    /** Adds quad from last point towards vector (dx1, dy1), to vector (dx2, dy2).
-        If SkPath is empty, or last SkPath::Verb
-        is kClose_Verb, last point is set to (0, 0) before adding quad.
-
-        Appends kMove_Verb to verb array and (0, 0) to SkPoint array,
-        if needed; then appends kQuad_Verb to verb array; and appends quad
-        control and quad end to SkPoint array.
-        Quad control is last point plus vector (dx1, dy1).
-        Quad end is last point plus vector (dx2, dy2).
-        Function name stands for "relative quad to".
-
-        @param dx1  offset from last point to quad control on x-axis
-        @param dy1  offset from last point to quad control on y-axis
-        @param dx2  offset from last point to quad end on x-axis
-        @param dy2  offset from last point to quad end on y-axis
-        @return     reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Conic_Weight_a
-        example: https://fiddle.skia.org/c/@Conic_Weight_b
-        example: https://fiddle.skia.org/c/@Conic_Weight_c
-        example: https://fiddle.skia.org/c/@Path_rQuadTo
-    */
-    SkPath& rQuadTo(SkScalar dx1, SkScalar dy1, SkScalar dx2, SkScalar dy2);
-
-    /** Adds conic from last point towards (x1, y1), to (x2, y2), weighted by w.
-        If SkPath is empty, or last SkPath::Verb is kClose_Verb, last point is set to (0, 0)
-        before adding conic.
-
-        Appends kMove_Verb to verb array and (0, 0) to SkPoint array, if needed.
-
-        If w is finite and not one, appends kConic_Verb to verb array;
-        and (x1, y1), (x2, y2) to SkPoint array; and w to conic weights.
-
-        If w is one, appends kQuad_Verb to verb array, and
-        (x1, y1), (x2, y2) to SkPoint array.
-
-        If w is not finite, appends kLine_Verb twice to verb array, and
-        (x1, y1), (x2, y2) to SkPoint array.
-
-        @param x1  control SkPoint of conic on x-axis
-        @param y1  control SkPoint of conic on y-axis
-        @param x2  end SkPoint of conic on x-axis
-        @param y2  end SkPoint of conic on y-axis
-        @param w   weight of added conic
-        @return    reference to SkPath
-    */
-    SkPath& conicTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2,
-                    SkScalar w);
-
-    /** Adds conic from last point towards SkPoint p1, to SkPoint p2, weighted by w.
-        If SkPath is empty, or last SkPath::Verb is kClose_Verb, last point is set to (0, 0)
-        before adding conic.
-
-        Appends kMove_Verb to verb array and (0, 0) to SkPoint array, if needed.
-
-        If w is finite and not one, appends kConic_Verb to verb array;
-        and SkPoint p1, p2 to SkPoint array; and w to conic weights.
-
-        If w is one, appends kQuad_Verb to verb array, and SkPoint p1, p2
-        to SkPoint array.
-
-        If w is not finite, appends kLine_Verb twice to verb array, and
-        SkPoint p1, p2 to SkPoint array.
-
-        @param p1  control SkPoint of added conic
-        @param p2  end SkPoint of added conic
-        @param w   weight of added conic
-        @return    reference to SkPath
-    */
-    SkPath& conicTo(const SkPoint& p1, const SkPoint& p2, SkScalar w) {
-        return this->conicTo(p1.fX, p1.fY, p2.fX, p2.fY, w);
-    }
-
-    /** Adds conic from last point towards vector (dx1, dy1), to vector (dx2, dy2),
-        weighted by w. If SkPath is empty, or last SkPath::Verb
-        is kClose_Verb, last point is set to (0, 0) before adding conic.
-
-        Appends kMove_Verb to verb array and (0, 0) to SkPoint array,
-        if needed.
-
-        If w is finite and not one, next appends kConic_Verb to verb array,
-        and w is recorded as conic weight; otherwise, if w is one, appends
-        kQuad_Verb to verb array; or if w is not finite, appends kLine_Verb
-        twice to verb array.
-
-        In all cases appends SkPoint control and end to SkPoint array.
-        control is last point plus vector (dx1, dy1).
-        end is last point plus vector (dx2, dy2).
-
-        Function name stands for "relative conic to".
-
-        @param dx1  offset from last point to conic control on x-axis
-        @param dy1  offset from last point to conic control on y-axis
-        @param dx2  offset from last point to conic end on x-axis
-        @param dy2  offset from last point to conic end on y-axis
-        @param w    weight of added conic
-        @return     reference to SkPath
-    */
-    SkPath& rConicTo(SkScalar dx1, SkScalar dy1, SkScalar dx2, SkScalar dy2,
-                     SkScalar w);
-
-    /** Adds cubic from last point towards (x1, y1), then towards (x2, y2), ending at
-        (x3, y3). If SkPath is empty, or last SkPath::Verb is kClose_Verb, last point is set to
-        (0, 0) before adding cubic.
-
-        Appends kMove_Verb to verb array and (0, 0) to SkPoint array, if needed;
-        then appends kCubic_Verb to verb array; and (x1, y1), (x2, y2), (x3, y3)
-        to SkPoint array.
-
-        @param x1  first control SkPoint of cubic on x-axis
-        @param y1  first control SkPoint of cubic on y-axis
-        @param x2  second control SkPoint of cubic on x-axis
-        @param y2  second control SkPoint of cubic on y-axis
-        @param x3  end SkPoint of cubic on x-axis
-        @param y3  end SkPoint of cubic on y-axis
-        @return    reference to SkPath
-    */
-    SkPath& cubicTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2,
-                    SkScalar x3, SkScalar y3);
-
-    /** Adds cubic from last point towards SkPoint p1, then towards SkPoint p2, ending at
-        SkPoint p3. If SkPath is empty, or last SkPath::Verb is kClose_Verb, last point is set to
-        (0, 0) before adding cubic.
-
-        Appends kMove_Verb to verb array and (0, 0) to SkPoint array, if needed;
-        then appends kCubic_Verb to verb array; and SkPoint p1, p2, p3
-        to SkPoint array.
-
-        @param p1  first control SkPoint of cubic
-        @param p2  second control SkPoint of cubic
-        @param p3  end SkPoint of cubic
-        @return    reference to SkPath
-    */
-    SkPath& cubicTo(const SkPoint& p1, const SkPoint& p2, const SkPoint& p3) {
-        return this->cubicTo(p1.fX, p1.fY, p2.fX, p2.fY, p3.fX, p3.fY);
-    }
-
-    /** Adds cubic from last point towards vector (dx1, dy1), then towards
-        vector (dx2, dy2), to vector (dx3, dy3).
-        If SkPath is empty, or last SkPath::Verb
-        is kClose_Verb, last point is set to (0, 0) before adding cubic.
-
-        Appends kMove_Verb to verb array and (0, 0) to SkPoint array,
-        if needed; then appends kCubic_Verb to verb array; and appends cubic
-        control and cubic end to SkPoint array.
-        Cubic control is last point plus vector (dx1, dy1).
-        Cubic end is last point plus vector (dx2, dy2).
-        Function name stands for "relative cubic to".
-
-        @param dx1  offset from last point to first cubic control on x-axis
-        @param dy1  offset from last point to first cubic control on y-axis
-        @param dx2  offset from last point to second cubic control on x-axis
-        @param dy2  offset from last point to second cubic control on y-axis
-        @param dx3  offset from last point to cubic end on x-axis
-        @param dy3  offset from last point to cubic end on y-axis
-        @return    reference to SkPath
-    */
-    SkPath& rCubicTo(SkScalar dx1, SkScalar dy1, SkScalar dx2, SkScalar dy2,
-                     SkScalar dx3, SkScalar dy3);
-
-    /** Appends arc to SkPath. Arc added is part of ellipse
-        bounded by oval, from startAngle through sweepAngle. Both startAngle and
-        sweepAngle are measured in degrees, where zero degrees is aligned with the
-        positive x-axis, and positive sweeps extends arc clockwise.
-
-        arcTo() adds line connecting SkPath last SkPoint to initial arc SkPoint if forceMoveTo
-        is false and SkPath is not empty. Otherwise, added contour begins with first point
-        of arc. Angles greater than -360 and less than 360 are treated modulo 360.
-
-        @param oval         bounds of ellipse containing arc
-        @param startAngle   starting angle of arc in degrees
-        @param sweepAngle   sweep, in degrees. Positive is clockwise; treated modulo 360
-        @param forceMoveTo  true to start a new contour with arc
-        @return             reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_arcTo
-    */
-    SkPath& arcTo(const SkRect& oval, SkScalar startAngle, SkScalar sweepAngle, bool forceMoveTo);
-
-    /** Appends arc to SkPath, after appending line if needed. Arc is implemented by conic
-        weighted to describe part of circle. Arc is contained by tangent from
-        last SkPath point to (x1, y1), and tangent from (x1, y1) to (x2, y2). Arc
-        is part of circle sized to radius, positioned so it touches both tangent lines.
-
-        If last Path Point does not start Arc, arcTo appends connecting Line to Path.
-        The length of Vector from (x1, y1) to (x2, y2) does not affect Arc.
-
-        Arc sweep is always less than 180 degrees. If radius is zero, or if
-        tangents are nearly parallel, arcTo appends Line from last Path Point to (x1, y1).
-
-        arcTo appends at most one Line and one conic.
-        arcTo implements the functionality of PostScript arct and HTML Canvas arcTo.
-
-        @param x1      x-axis value common to pair of tangents
-        @param y1      y-axis value common to pair of tangents
-        @param x2      x-axis value end of second tangent
-        @param y2      y-axis value end of second tangent
-        @param radius  distance from arc to circle center
-        @return        reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_arcTo_2_a
-        example: https://fiddle.skia.org/c/@Path_arcTo_2_b
-        example: https://fiddle.skia.org/c/@Path_arcTo_2_c
-    */
-    SkPath& arcTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2, SkScalar radius);
-
-    /** Appends arc to SkPath, after appending line if needed. Arc is implemented by conic
-        weighted to describe part of circle. Arc is contained by tangent from
-        last SkPath point to p1, and tangent from p1 to p2. Arc
-        is part of circle sized to radius, positioned so it touches both tangent lines.
-
-        If last SkPath SkPoint does not start arc, arcTo() appends connecting line to SkPath.
-        The length of vector from p1 to p2 does not affect arc.
-
-        Arc sweep is always less than 180 degrees. If radius is zero, or if
-        tangents are nearly parallel, arcTo() appends line from last SkPath SkPoint to p1.
-
-        arcTo() appends at most one line and one conic.
-        arcTo() implements the functionality of PostScript arct and HTML Canvas arcTo.
-
-        @param p1      SkPoint common to pair of tangents
-        @param p2      end of second tangent
-        @param radius  distance from arc to circle center
-        @return        reference to SkPath
-    */
-    SkPath& arcTo(SkPoint p1, SkPoint p2, SkScalar radius) {
-        return this->arcTo(p1.fX, p1.fY, p2.fX, p2.fY, radius);
-    }
-
-    /** Appends arc to SkPath. Arc is implemented by one or more conics weighted to
-        describe part of oval with radii (rx, ry) rotated by xAxisRotate degrees. Arc
-        curves from last SkPath SkPoint to (x, y), choosing one of four possible routes:
-        clockwise or counterclockwise, and smaller or larger.
-
-        Arc sweep is always less than 360 degrees. arcTo() appends line to (x, y) if
-        either radii are zero, or if last SkPath SkPoint equals (x, y). arcTo() scales radii
-        (rx, ry) to fit last SkPath SkPoint and (x, y) if both are greater than zero but
-        too small.
-
-        arcTo() appends up to four conic curves.
-        arcTo() implements the functionality of SVG arc, although SVG sweep-flag value
-        is opposite the integer value of sweep; SVG sweep-flag uses 1 for clockwise,
-        while kCW_Direction cast to int is zero.
-
-        @param rx           radius on x-axis before x-axis rotation
-        @param ry           radius on y-axis 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 x            end of arc
-        @param y            end of arc
-        @return             reference to SkPath
-    */
-    SkPath& arcTo(SkScalar rx, SkScalar ry, SkScalar xAxisRotate, ArcSize largeArc,
-                  SkPathDirection sweep, SkScalar x, SkScalar y);
-
-    /** Appends arc to SkPath. Arc is implemented by one or more conic weighted to describe
-        part of oval with radii (r.fX, r.fY) rotated by xAxisRotate degrees. Arc curves
-        from last SkPath SkPoint to (xy.fX, xy.fY), choosing one of four possible routes:
-        clockwise or counterclockwise,
-        and smaller or larger.
-
-        Arc sweep is always less than 360 degrees. arcTo() appends line to xy if either
-        radii are zero, or if last SkPath SkPoint equals (xy.fX, xy.fY). arcTo() scales radii r to
-        fit last SkPath SkPoint and xy if both are greater than zero but too small to describe
-        an arc.
-
-        arcTo() appends up to four conic curves.
-        arcTo() implements the functionality of SVG arc, although SVG sweep-flag value is
-        opposite the integer value of sweep; SVG sweep-flag uses 1 for clockwise, while
-        kCW_Direction cast to int is zero.
-
-        @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 xy           end of arc
-        @return             reference to SkPath
-    */
-    SkPath& arcTo(SkPoint r,
-                  SkScalar xAxisRotate,
-                  ArcSize largeArc,
-                  SkPathDirection sweep,
-                  const SkPoint xy) {
-        return this->arcTo(r.fX, r.fY, xAxisRotate, largeArc, sweep, xy.fX, xy.fY);
-    }
-
-    /** Appends arc to SkPath, relative to last SkPath SkPoint. Arc is implemented by one or
-        more conic, weighted to describe part of oval with radii (rx, ry) rotated by
-        xAxisRotate degrees. Arc curves from last SkPath SkPoint to relative end SkPoint:
-        (dx, dy), choosing one of four possible routes: clockwise or
-        counterclockwise, and smaller or larger. If SkPath is empty, the start arc SkPoint
-        is (0, 0).
-
-        Arc sweep is always less than 360 degrees. arcTo() appends line to end SkPoint
-        if either radii are zero, or if last SkPath SkPoint equals end SkPoint.
-        arcTo() scales radii (rx, ry) to fit last SkPath SkPoint and end SkPoint if both are
-        greater than zero but too small to describe an arc.
-
-        arcTo() appends up to four conic curves.
-        arcTo() implements the functionality of svg arc, although SVG "sweep-flag" value is
-        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 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
-        @return             reference to SkPath
-    */
-    SkPath& rArcTo(SkScalar rx, SkScalar ry, SkScalar xAxisRotate, ArcSize largeArc,
-                   SkPathDirection sweep, SkScalar dx, SkScalar dy);
-
-    /** Appends kClose_Verb to SkPath. A closed contour connects the first and last SkPoint
-        with line, forming a continuous loop. Open and closed contour draw the same
-        with SkPaint::kFill_Style. With SkPaint::kStroke_Style, open contour draws
-        SkPaint::Cap at contour start and end; closed contour draws
-        SkPaint::Join at contour start and end.
-
-        close() has no effect if SkPath is empty or last SkPath SkPath::Verb is kClose_Verb.
-
-        @return  reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_close
-    */
-    SkPath& close();
-
-    /** Adds a new contour to the path, defined by the rect, and wound in the
-        specified direction. The verbs added to the path will be:
-
-        kMove, kLine, kLine, kLine, kClose
-
-        start specifies which corner to begin the contour:
-            0: upper-left  corner
-            1: upper-right corner
-            2: lower-right corner
-            3: lower-left  corner
-
-        This start point also acts as the implied beginning of the subsequent,
-        contour, if it does not have an explicit moveTo(). e.g.
-
-            path.addRect(...)
-            // if we don't say moveTo() here, we will use the rect's start point
-            path.lineTo(...)
-
-        @param rect   SkRect to add as a closed contour
-        @param dir    SkPath::Direction to orient the new contour
-        @param start  initial corner of SkRect to add
-        @return       reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_addRect_2
-     */
-    SkPath& addRect(const SkRect& rect, SkPathDirection dir, unsigned start);
-
-    SkPath& addRect(const SkRect& rect, SkPathDirection dir = SkPathDirection::kCW) {
-        return this->addRect(rect, dir, 0);
-    }
-
-    SkPath& addRect(SkScalar left, SkScalar top, SkScalar right, SkScalar bottom,
-                    SkPathDirection dir = SkPathDirection::kCW) {
-        return this->addRect({left, top, right, bottom}, dir, 0);
-    }
-
-    /** Adds oval to path, appending kMove_Verb, four kConic_Verb, and kClose_Verb.
-        Oval is upright ellipse bounded by SkRect oval with radii equal to half oval width
-        and half oval height. Oval begins at (oval.fRight, oval.centerY()) and continues
-        clockwise if dir is kCW_Direction, counterclockwise if dir is kCCW_Direction.
-
-        @param oval  bounds of ellipse added
-        @param dir   SkPath::Direction to wind ellipse
-        @return      reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_addOval
-    */
-    SkPath& addOval(const SkRect& oval, SkPathDirection dir = SkPathDirection::kCW);
-
-    /** Adds oval to SkPath, appending kMove_Verb, four kConic_Verb, and kClose_Verb.
-        Oval is upright ellipse bounded by SkRect oval with radii equal to half oval width
-        and half oval height. Oval begins at start and continues
-        clockwise if dir is kCW_Direction, counterclockwise if dir is kCCW_Direction.
-
-        @param oval   bounds of ellipse added
-        @param dir    SkPath::Direction to wind ellipse
-        @param start  index of initial point of ellipse
-        @return       reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_addOval_2
-    */
-    SkPath& addOval(const SkRect& oval, SkPathDirection dir, unsigned start);
-
-    /** Adds circle centered at (x, y) of size radius to SkPath, appending kMove_Verb,
-        four kConic_Verb, and kClose_Verb. Circle begins at: (x + radius, y), continuing
-        clockwise if dir is kCW_Direction, and counterclockwise if dir is kCCW_Direction.
-
-        Has no effect if radius is zero or negative.
-
-        @param x       center of circle
-        @param y       center of circle
-        @param radius  distance from center to edge
-        @param dir     SkPath::Direction to wind circle
-        @return        reference to SkPath
-    */
-    SkPath& addCircle(SkScalar x, SkScalar y, SkScalar radius,
-                      SkPathDirection dir = SkPathDirection::kCW);
-
-    /** Appends arc to SkPath, as the start of new contour. Arc added is part of ellipse
-        bounded by oval, from startAngle through sweepAngle. Both startAngle and
-        sweepAngle are measured in degrees, where zero degrees is aligned with the
-        positive x-axis, and positive sweeps extends arc clockwise.
-
-        If sweepAngle <= -360, or sweepAngle >= 360; and startAngle modulo 90 is nearly
-        zero, append oval instead of arc. Otherwise, sweepAngle values are treated
-        modulo 360, and arc may or may not draw depending on numeric rounding.
-
-        @param oval        bounds of ellipse containing arc
-        @param startAngle  starting angle of arc in degrees
-        @param sweepAngle  sweep, in degrees. Positive is clockwise; treated modulo 360
-        @return            reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_addArc
-    */
-    SkPath& addArc(const SkRect& oval, SkScalar startAngle, SkScalar sweepAngle);
-
-    /** Appends SkRRect to SkPath, creating a new closed contour. SkRRect has bounds
-        equal to rect; each corner is 90 degrees of an ellipse with radii (rx, ry). If
-        dir is kCW_Direction, SkRRect starts at top-left of the lower-left corner and
-        winds clockwise. If dir is kCCW_Direction, SkRRect starts at the bottom-left
-        of the upper-left corner and winds counterclockwise.
-
-        If either rx or ry is too large, rx and ry are scaled uniformly until the
-        corners fit. If rx or ry is less than or equal to zero, addRoundRect() appends
-        SkRect rect to SkPath.
-
-        After appending, SkPath may be empty, or may contain: SkRect, oval, or SkRRect.
-
-        @param rect  bounds of SkRRect
-        @param rx    x-axis radius of rounded corners on the SkRRect
-        @param ry    y-axis radius of rounded corners on the SkRRect
-        @param dir   SkPath::Direction to wind SkRRect
-        @return      reference to SkPath
-    */
-    SkPath& addRoundRect(const SkRect& rect, SkScalar rx, SkScalar ry,
-                         SkPathDirection dir = SkPathDirection::kCW);
-
-    /** Appends SkRRect to SkPath, creating a new closed contour. SkRRect has bounds
-        equal to rect; each corner is 90 degrees of an ellipse with radii from the
-        array.
-
-        @param rect   bounds of SkRRect
-        @param radii  array of 8 SkScalar values, a radius pair for each corner
-        @param dir    SkPath::Direction to wind SkRRect
-        @return       reference to SkPath
-    */
-    SkPath& addRoundRect(const SkRect& rect, SkSpan<const SkScalar> radii,
-                         SkPathDirection dir = SkPathDirection::kCW);
-
-    /** Adds rrect to SkPath, creating a new closed contour. If
-        dir is kCW_Direction, rrect starts at top-left of the lower-left corner and
-        winds clockwise. If dir is kCCW_Direction, rrect starts at the bottom-left
-        of the upper-left corner and winds counterclockwise.
-
-        After appending, SkPath may be empty, or may contain: SkRect, oval, or SkRRect.
-
-        @param rrect  bounds and radii of rounded rectangle
-        @param dir    SkPath::Direction to wind SkRRect
-        @return       reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_addRRect
-    */
-    SkPath& addRRect(const SkRRect& rrect, SkPathDirection dir = SkPathDirection::kCW);
-
-    /** Adds rrect to SkPath, creating a new closed contour. If dir is kCW_Direction, rrect
-        winds clockwise; if dir is kCCW_Direction, rrect winds counterclockwise.
-        start determines the first point of rrect to add.
-
-        @param rrect  bounds and radii of rounded rectangle
-        @param dir    SkPath::Direction to wind SkRRect
-        @param start  index of initial point of SkRRect
-        @return       reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_addRRect_2
-    */
-    SkPath& addRRect(const SkRRect& rrect, SkPathDirection dir, unsigned start);
-
-    /** Adds contour created from line array, adding (count - 1) line segments.
-        Contour added starts at pts[0], then adds a line for every additional SkPoint
-        in pts array. If close is true, appends kClose_Verb to SkPath, connecting
-        pts[count - 1] and pts[0].
-
-        If count is zero, append kMove_Verb to path.
-        Has no effect if count is less than one.
-
-        @param pts    array of line sharing end and start SkPoint
-        @param count  length of SkPoint array
-        @param close  true to add line connecting contour end and start
-        @return       reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_addPoly
-    */
-    SkPath& addPoly(SkSpan<const SkPoint> pts, bool close);
-
-    /** Appends src to SkPath, offset by (dx, dy).
-
-        If mode is kAppend_AddPathMode, src verb array, SkPoint array, and conic weights are
-        added unaltered. If mode is kExtend_AddPathMode, add line before appending
-        verbs, SkPoint, and conic weights.
-
-        @param src   SkPath verbs, SkPoint, and conic weights to add
-        @param dx    offset added to src SkPoint array x-axis coordinates
-        @param dy    offset added to src SkPoint array y-axis coordinates
-        @param mode  kAppend_AddPathMode or kExtend_AddPathMode
-        @return      reference to SkPath
-    */
-    SkPath& addPath(const SkPath& src, SkScalar dx, SkScalar dy,
-                    AddPathMode mode = kAppend_AddPathMode);
-
-    /** Appends src to SkPath.
-
-        If mode is kAppend_AddPathMode, src verb array, SkPoint array, and conic weights are
-        added unaltered. If mode is kExtend_AddPathMode, add line before appending
-        verbs, SkPoint, and conic weights.
-
-        @param src   SkPath verbs, SkPoint, and conic weights to add
-        @param mode  kAppend_AddPathMode or kExtend_AddPathMode
-        @return      reference to SkPath
-    */
-    SkPath& addPath(const SkPath& src, AddPathMode mode = kAppend_AddPathMode) {
-        SkMatrix m;
-        m.reset();
-        return this->addPath(src, m, mode);
-    }
-
-    /** Appends src to SkPath, transformed by matrix. Transformed curves may have different
-        verbs, SkPoint, and conic weights.
-
-        If mode is kAppend_AddPathMode, src verb array, SkPoint array, and conic weights are
-        added unaltered. If mode is kExtend_AddPathMode, add line before appending
-        verbs, SkPoint, and conic weights.
-
-        @param src     SkPath verbs, SkPoint, and conic weights to add
-        @param matrix  transform applied to src
-        @param mode    kAppend_AddPathMode or kExtend_AddPathMode
-        @return        reference to SkPath
-    */
-    SkPath& addPath(const SkPath& src, const SkMatrix& matrix,
-                    AddPathMode mode = kAppend_AddPathMode);
-
-    /** Appends src to SkPath, from back to front.
-        Reversed src always appends a new contour to SkPath.
-
-        @param src  SkPath verbs, SkPoint, and conic weights to add
-        @return     reference to SkPath
-
-        example: https://fiddle.skia.org/c/@Path_reverseAddPath
-    */
-    SkPath& reverseAddPath(const SkPath& src);
-
-    /** Sets last point to (x, y). If SkPoint array is empty, append kMove_Verb to
-        verb array and append (x, y) to SkPoint array.
-
-        @param x  set x-axis value of last point
-        @param y  set y-axis value of last point
-
-        example: https://fiddle.skia.org/c/@Path_setLastPt
-    */
-    void setLastPt(SkScalar x, SkScalar y);
-
-    /** Sets the last point on the path. If SkPoint array is empty, append kMove_Verb to
-        verb array and append p to SkPoint array.
-
-        @param p  set value of last point
-    */
-    void setLastPt(const SkPoint& p) {
-        this->setLastPt(p.fX, p.fY);
-    }
-#endif
-
-#ifdef SK_HIDE_PATH_EDIT_METHODS
-private:
-#endif
-
-#ifndef SK_PATH_USES_PATHDATA
-    /** Offsets SkPoint array by (dx, dy). Offset SkPath replaces dst.
-        If dst is nullptr, SkPath is replaced by offset data.
-
-        @param dx   offset added to SkPoint array x-axis coordinates
-        @param dy   offset added to SkPoint array y-axis coordinates
-        @param dst  overwritten, translated copy of SkPath; may be nullptr
-
-        example: https://fiddle.skia.org/c/@Path_offset
-    */
-    void offset(SkScalar dx, SkScalar dy, SkPath* dst) const;
-
-    /** Offsets SkPoint array by (dx, dy). SkPath is replaced by offset data.
-
-        @param dx  offset added to SkPoint array x-axis coordinates
-        @param dy  offset added to SkPoint array y-axis coordinates
-    */
-    SkPath& offset(SkScalar dx, SkScalar dy) {
-        this->offset(dx, dy, this);
-        return *this;
-    }
-
-    /** Transforms verb array, SkPoint array, and weight by matrix.
-        transform may change verbs and increase their number.
-        Transformed SkPath replaces dst; if dst is nullptr, original data
-        is replaced.
-
-        @param matrix  SkMatrix to apply to SkPath
-        @param dst     overwritten, transformed copy of SkPath; may be nullptr
-        @param pc      whether to apply perspective clipping
-
-        example: https://fiddle.skia.org/c/@Path_transform
-    */
-    void transform(const SkMatrix& matrix, SkPath* dst) const;
-
-    /** Transforms verb array, SkPoint array, and weight by matrix.
-        transform may change verbs and increase their number.
-        SkPath is replaced by transformed data.
-
-        @param matrix  SkMatrix to apply to SkPath
-        @param pc      whether to apply perspective clipping
-    */
-    SkPath& transform(const SkMatrix& matrix) {
-        this->transform(matrix, this);
-        return *this;
-    }
-#endif
-
-#ifdef SK_HIDE_PATH_EDIT_METHODS
-public:
-#endif
-
-#ifdef SK_SUPPORT_UNSPANNED_APIS
-    static SkPath Make(const SkPoint points[], int pointCount,
-                       const uint8_t verbs[], int verbCount,
-                       const SkScalar conics[], int conicWeightCount,
-                       SkPathFillType fillType, bool isVolatile = false) {
-        return Make({points, pointCount},
-                    {verbs, verbCount},
-                    {conics, conicWeightCount},
-                    fillType, isVolatile);
-    }
-    static SkPath Polygon(const SkPoint pts[], int count, bool isClosed,
-                          SkPathFillType fillType = SkPathFillType::kWinding,
-                          bool isVolatile = false) {
-        return Polygon({pts, count}, isClosed, fillType, isVolatile);
-    }
-    int getPoints(SkPoint points[], int max) const {
-        return (int)this->getPoints({points, max});
-    }
-    int getVerbs(uint8_t verbs[], int max) const {
-        return (int)this->getVerbs({verbs, max});
-    }
-#ifndef SK_HIDE_PATH_EDIT_METHODS
-    SkPath& addRoundRect(const SkRect& rect, const SkScalar radii[],
-                         SkPathDirection dir = SkPathDirection::kCW) {
-        return this->addRoundRect(rect, {radii, radii ? 8 : 0}, dir);
-    }
-    SkPath& addPoly(const SkPoint pts[], int count, bool close) {
-        return this->addPoly({pts, count}, close);
-    }
-#endif  // SK_HIDE_PATH_EDIT_METHODS
-#endif  // SK_SUPPORT_UNSPANNED_APIS
-
     SkPathIter iter() const;
 
     struct IterRec {
@@ -1918,10 +1093,6 @@ public:
     static std::optional<SkPath> ReadFromMemory(const void* buffer, size_t length,
                                                 size_t* bytesRead = nullptr);
 
-#ifndef SK_HIDE_PATH_EDIT_METHODS
-    size_t readFromMemory(const void* buffer, size_t length);
-#endif
-
     /** (See skbug.com/40032862)
         Returns a non-zero, globally unique value. A different value is returned
         if verb array, SkPoint array, or conic weight changes.
@@ -1948,7 +1119,6 @@ public:
     using sk_is_trivially_relocatable = std::true_type;
 
 private:
-#ifdef SK_PATH_USES_PATHDATA
     static SkPath MakeNullCheck(sk_sp<SkPathData>, SkPathFillType, bool isVolatile);
     static SkPathData* PeekErrorSingleton();
 
@@ -1957,63 +1127,13 @@ private:
     sk_sp<SkPathData> fPathData;
     SkPathFillType    fFillType;
     bool              fIsVolatile;
-#else
-    SkPath(sk_sp<SkPathRef>, SkPathFillType, bool isVolatile, SkPathConvexity);
-
-    sk_sp<SkPathRef>             fPathRef;
-    int                          fLastMoveToIndex;
-    mutable std::atomic<uint8_t> fConvexity;      // SkPathConvexity
-    SkPathFillType               fFillType;
-    bool                         fIsVolatile;
-
-    static_assert(::sk_is_trivially_relocatable<decltype(fPathRef)>::value);
-
-    /** Resets all fields other than fPathRef to their initial 'empty' values.
-     *  Assumes the caller has already emptied fPathRef.
-     */
-    void resetFields();
-
-    /** Sets all fields other than fPathRef to the values in 'that'.
-     *  Assumes the caller has already set fPathRef.
-     *  Doesn't change fGenerationID or fSourcePath on Android.
-     */
-    void copyFields(const SkPath& that);
-
-    // Creates a new Path after the supplied arguments have been validated by
-    // SkPathPriv::AnalyzeVerbs().
-    static SkPath MakeInternal(const SkPathVerbAnalysis&,
-                               const SkPoint[],
-                               SkSpan<const SkPathVerb>,
-                               const float conics[],
-                               SkPathFillType,
-                               bool isVolatile);
-#endif
 
     size_t writeToMemoryAsRRect(void* buffer) const;
-    size_t readAsRRect(const void*, size_t);
 
     friend class Iter;
     friend class SkPathPriv;
     friend class SkPathStroker;
 
-    /*  Append, in reverse order, the first contour of path, ignoring path's
-        last point. If no moveTo() call has been made for this contour, the
-        first point is automatically set to (0,0).
-    */
-    SkPath& reversePathTo(const SkPath&);
-
-    // called before we add points for lineTo, quadTo, cubicTo, checking to see
-    // if we need to inject a leading moveTo first
-    //
-    //  SkPath path; path.lineTo(...);   <--- need a leading moveTo(0, 0)
-    // SkPath path; ... path.close(); path.lineTo(...) <-- need a moveTo(previous moveTo)
-    //
-    void injectMoveToIfNeeded();
-
-    bool hasOnlyMoveTos() const {
-        return this->getSegmentMasks() == 0;
-    }
-
     SkPathConvexity computeConvexity() const;
 
     bool isValidImpl() const;
@@ -2022,26 +1142,8 @@ private:
      */
 #ifdef SK_DEBUG
     void validate() const;
-    void validateRef() const;
 #endif
 
-    // called by stroker to see if all points (in the last contour) are equal and worthy of a cap
-    bool isZeroLengthSincePoint(int startPtIndex) const;
-
-    /** Returns if the path can return a bound at no cost (true) or will have to
-        perform some computation (false).
-     */
-    bool hasComputedBounds() const;
-
-    // 'rect' needs to be sorted
-    void setBounds(const SkRect& rect);
-
-    void setPt(int index, SkScalar x, SkScalar y);
-
-    SkPath& dirtyAfterEdit();
-
-    void addRaw(const SkPathRaw&);
-
     /** Returns the comvexity type, computing if needed. Never returns kUnknown.
         @return  path's convexity type (convex or concave)
     */
@@ -2055,9 +1157,7 @@ private:
      */
     void setConvexity(SkPathConvexity) const;
 
-    friend class SkAutoAddSimpleShape;  // setConvexity
     friend class SkPathBuilder;
-    friend class PathTest_Private; // unit test reversePathTo
 };
 
 #endif