@shopify/react-native-skia 2.6.0 → 2.6.1

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

@@ -30,7 +30,15 @@ class SkRRect;
 struct SkPathRaw;
 class SkString;
 
+// todo: add this flag to clients
+#ifndef SK_SUPPORT_LEGACY_PATHBUILDER_SETLASTPT
+#define SK_SUPPORT_LEGACY_PATHBUILDER_SETLASTPT
+#endif
+
 class SK_API SkPathBuilder {
+    using PointsArray = skia_private::STArray<4, SkPoint>;
+    using VerbsArray = skia_private::STArray<4, SkPathVerb>;
+    using ConicWeightsArray = skia_private::STArray<2, float>;
 public:
     /** Constructs an empty SkPathBuilder. By default, SkPathBuilder has no verbs, no SkPoint, and
         no weights. FillType is set to kWinding.
@@ -39,6 +47,12 @@ public:
     */
     SkPathBuilder();
 
+    SkPathBuilder(const SkPathBuilder&);
+    SkPathBuilder& operator=(const SkPathBuilder&);
+    SkPathBuilder(SkPathBuilder&&);
+    SkPathBuilder& operator=(SkPathBuilder&&);
+    ~SkPathBuilder();
+
     /** Constructs an empty SkPathBuilder with the given FillType. By default, SkPathBuilder has no
         verbs, no SkPoint, and no weights.
 
@@ -55,9 +69,6 @@ public:
     */
     explicit SkPathBuilder(const SkPath& path);
 
-    SkPathBuilder(const SkPathBuilder&) = default;
-    ~SkPathBuilder();
-
     /** Sets an SkPathBuilder to be a copy of an existing SkPath.
         Copies the FillType and replays all of the verbs from the SkPath into the SkPathBuilder.
 
@@ -65,7 +76,6 @@ 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); }
@@ -86,9 +96,7 @@ public:
 
         @return  bounds of all SkPoint in SkPoint array, or {}.
     */
-    std::optional<SkRect> computeFiniteBounds() const {
-        return SkRect::Bounds(fPts);
-    }
+    std::optional<SkRect> computeFiniteBounds() const;
 
     /** 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
@@ -789,20 +797,22 @@ public:
         return this->addOval(oval, dir, 1);
     }
 
-    /** Adds circle centered at (x, y) of size radius to SkPathBuilder, 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.
+    /** Adds circle with center and radius to SkPathBuilder, appending kMove_Verb,
+        four kConic_Verb, and kClose_Verb. Circle begins at: (center.fX + radius, center.fY).
 
         Has no effect if radius is zero or negative.
 
-        @param x       center of circle
-        @param y       center of circle
+        @param center  center of circle
         @param radius  distance from center to edge
         @param dir     SkPath::Direction to wind circle
         @return        reference to SkPathBuilder
     */
-    SkPathBuilder& addCircle(SkScalar x, SkScalar y, SkScalar radius,
+    SkPathBuilder& addCircle(SkPoint center, float radius,
                              SkPathDirection dir = SkPathDirection::kDefault);
+    SkPathBuilder& addCircle(float x, float y, float radius,
+                             SkPathDirection dir = SkPathDirection::kDefault) {
+        return this->addCircle({x, y}, radius, dir);
+    }
 
     /** Adds contour created from line array, adding (pts.size() - 1) line segments.
         Contour added starts at pts[0], then adds a line for every additional SkPoint
@@ -934,13 +944,24 @@ public:
      */
     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.
+    /** Change the last point in the builder.
+     *  If the builder is empty, the call does nothing.
+     *
+     *  @param p the new point value
+     */
+    void setLastPoint(SkPoint p) {
+        this->setPoint(this->points().size() - 1, p);
+    }
+
+#ifdef SK_SUPPORT_LEGACY_PATHBUILDER_SETLASTPT
+    /** DEPRECATED: use setLastPoint() or setPoint()
+        Sets the last point on the path. If SkPoint array is empty, this behaves like moveTo().
 
-        @param x  x-value of last point
-        @param y  y-value of last point
+        @param pt the new value for the last point in the path
     */
-    void setLastPt(SkScalar x, SkScalar y);
+    void setLastPt(SkPoint pt);
+    void setLastPt(float x, float y) { this->setLastPt({x, y}); }
+#endif
 
     /** Returns the number of points in SkPathBuilder.
         SkPoint count is initially zero.
@@ -956,15 +977,6 @@ public:
     */
     bool isInverseFillType() const { return SkPathFillType_IsInverse(fFillType); }
 
-#ifdef SK_SUPPORT_UNSPANNED_APIS
-    SkPathBuilder& addPolygon(const SkPoint pts[], int count, bool close) {
-        return this->addPolygon({pts, count}, close);
-    }
-    SkPathBuilder& polylineTo(const SkPoint pts[], int count) {
-        return this->polylineTo({pts, count});
-    }
-#endif
-
     SkSpan<const SkPoint> points() const {
         return fPts;
     }
@@ -992,9 +1004,9 @@ public:
     bool contains(SkPoint) const;
 
 private:
-    SkPathRef::PointsArray fPts;
-    SkPathRef::VerbsArray fVerbs;
-    SkPathRef::ConicWeightsArray fConicWeights;
+    PointsArray fPts;
+    VerbsArray fVerbs;
+    ConicWeightsArray fConicWeights;
 
     SkPathFillType  fFillType;
     bool            fIsVolatile;
@@ -1016,8 +1028,6 @@ private:
         }
     }
 
-    SkPath make(sk_sp<SkPathRef>) const;
-
     bool isZeroLengthSincePoint(int startPtIndex) const;
 
     SkPathBuilder& privateReverseAddPath(const SkPath&);

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

@@ -78,15 +78,6 @@ public:
 
     static sk_sp<SkPathEffect> Deserialize(const void* data, size_t size,
                                            const SkDeserialProcs* procs = nullptr);
-
-#ifdef SK_SUPPORT_MUTABLE_PATHEFFECT
-    bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*, const SkRect* cullR) const;
-
-    /** Version of filterPath that can be called when the CTM is known. */
-    bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*, const SkRect* cullR,
-                    const SkMatrix& ctm) const;
-#endif
-
 private:
     SkPathEffect() = default;
     friend class SkPathEffectBase;

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

@@ -65,16 +65,13 @@ public:
     [[nodiscard]] bool getMatrix(SkScalar distance, SkMatrix* matrix,
                                  MatrixFlags flags = kGetPosAndTan_MatrixFlag);
 
-    /** Given a start and stop distance, return in dst the intervening segment(s).
+    /** Given a start and stop distance, append to dst the intervening segment(s).
         If the segment is zero-length, return false, else return true.
         startD and stopD are pinned to legal values (0..getLength()). If startD > stopD
         then return false (and leave dst untouched).
         Begin the segment with a moveTo if startWithMoveTo is true
     */
     bool getSegment(SkScalar startD, SkScalar stopD, SkPathBuilder* dst, bool startWithMoveTo);
-#ifdef SK_SUPPORT_MUTABLE_PATHEFFECT
-    bool getSegment(SkScalar startD, SkScalar stopD, SkPath* dst, bool startWithMoveTo);
-#endif
 
     /** Return true if the current contour is closed()
     */

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

@@ -34,16 +34,6 @@ SK_API bool FillPathWithPaint(const SkPath& src, const SkPaint& paint, SkPathBui
 
 SK_API SkPath FillPathWithPaint(const SkPath& src, const SkPaint& paint, bool* isFill = nullptr);
 
-#ifdef SK_SUPPORT_MUTABLE_PATHEFFECT
-SK_API bool FillPathWithPaint(const SkPath &src, const SkPaint &paint, SkPath *dst,
-                              const SkRect *cullRect, SkScalar resScale = 1);
-
-SK_API bool FillPathWithPaint(const SkPath &src, const SkPaint &paint, SkPath *dst,
-                              const SkRect *cullRect, const SkMatrix &ctm);
-
-SK_API bool FillPathWithPaint(const SkPath &src, const SkPaint &paint, SkPath *dst);
-#endif
-
 }
 
 #endif

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

@@ -951,18 +951,6 @@ struct SK_API SkRect {
      */
     void setBoundsNoCheck(SkSpan<const SkPoint> pts);
 
-#ifdef SK_SUPPORT_UNSPANNED_APIS
-    void setBounds(const SkPoint pts[], int count) {
-        this->setBounds({pts, count});
-    }
-    void setBoundsNoCheck(const SkPoint pts[], int count) {
-        this->setBoundsNoCheck({pts, count});
-    }
-    bool setBoundsCheck(const SkPoint pts[], int count) {
-        return this->setBoundsCheck({pts, count});
-    }
-#endif
-
     /** Sets bounds to the smallest SkRect enclosing SkPoint p0 and p1. The result is
         sorted and may be empty. Does not check to see if values are finite.
 

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

@@ -8,14 +8,13 @@
 #ifndef SkRegion_DEFINED
 #define SkRegion_DEFINED
 
+#include "include/core/SkPath.h"
 #include "include/core/SkRect.h"
 #include "include/private/base/SkAPI.h"
 #include "include/private/base/SkAssert.h"
 #include "include/private/base/SkDebug.h"
 #include "include/private/base/SkTypeTraits.h"
 
-#include "include/core/SkPath.h"    // IWYU -- for SK_HIDE_PATH_EDIT_METHODS
-
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>
@@ -195,10 +194,6 @@ public:
      */
     SkPath getBoundaryPath() const;
 
-#ifndef SK_HIDE_PATH_EDIT_METHODS
-    bool getBoundaryPath(SkPath* path) const;
-#endif
-
     /** Constructs an empty SkRegion. SkRegion is set to empty bounds
         at (0, 0) with zero width and height. Always returns false.
 

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

@@ -19,16 +19,13 @@ class SkImage;
 class SkPicture;
 class SkTypeface;
 class SkReadBuffer;
+class SkStream;
 enum SkAlphaType : int;
 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).
@@ -84,7 +81,9 @@ using SkSlugProc = sk_sp<sktext::gpu::Slug> (*)(SkReadBuffer&, void* ctx);
 /**
  *  Called with the encoded form of a typeface (previously written with a custom
  *  SkSerialTypefaceProc proc). Return a typeface object, or nullptr indicating failure.
+ *  TODO: Users must not attempt to fork or duplicate the passed stream and hold on to the result.
  */
+using SkDeserialTypefaceStreamProc = sk_sp<SkTypeface> (*)(SkStream&, void* ctx);
 using SkDeserialTypefaceProc = sk_sp<SkTypeface> (*)(const void* data, size_t length, void* ctx);
 
 struct SK_API SkSerialProcs {
@@ -109,7 +108,7 @@ struct SK_API SkDeserialProcs {
     SkSlugProc                   fSlugProc = nullptr;
     void*                        fSlugCtx = nullptr;
 
-    SkDeserialTypefaceProc       fTypefaceProc = nullptr;
+    SkDeserialTypefaceStreamProc fTypefaceStreamProc = nullptr;
     void*                        fTypefaceCtx = nullptr;
 
     // This looks like a flag, but it could be considered a proc as well (one that takes no

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

@@ -60,6 +60,8 @@ public:
         // If set, all rendering will have dithering enabled
         // Currently this only impacts GPU backends
         kAlwaysDither_Flag = 1 << 2,
+        // The surface will preserve transparent draws (instead of skipping them).
+        kPreservesTransparentDraws_Flag = 1 << 3,
     };
 
     /** No flags, unknown pixel geometry, platform-default contrast/gamma. */
@@ -94,6 +96,10 @@ public:
         return SkToBool(fFlags & kAlwaysDither_Flag);
     }
 
+    bool preservesTransparentDraws() const {
+        return SkToBool(fFlags & kPreservesTransparentDraws_Flag);
+    }
+
     bool operator==(const SkSurfaceProps& that) const {
         return fFlags == that.fFlags && fPixelGeometry == that.fPixelGeometry &&
         fTextContrast == that.fTextContrast && fTextGamma == that.fTextGamma;

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

@@ -262,28 +262,6 @@ public:
         const RunRecord* fRunRecord;
     };
 
-#ifdef SK_SUPPORT_UNSPANNED_APIS
-    static sk_sp<SkTextBlob> MakeFromPosTextH(const void* text, size_t byteLength,
-                                              const SkScalar xpos[], SkScalar constY,
-                                              const SkFont& font,
-                                              SkTextEncoding encoding = SkTextEncoding::kUTF8) {
-        const size_t worstCaseCount = byteLength;
-        return MakeFromPosTextH(text, byteLength, {xpos, worstCaseCount}, constY, font, encoding);
-    }
-    static sk_sp<SkTextBlob> MakeFromPosText(const void* text, size_t byteLength,
-                                             const SkPoint pos[], const SkFont& font,
-                                             SkTextEncoding encoding = SkTextEncoding::kUTF8) {
-        const size_t worstCaseCount = byteLength;
-        return MakeFromPosText(text, byteLength, {pos, worstCaseCount}, font, encoding);
-    }
-    static sk_sp<SkTextBlob> MakeFromRSXform(const void* text, size_t byteLength,
-                                              const SkRSXform xform[], const SkFont& font,
-                                              SkTextEncoding encoding = SkTextEncoding::kUTF8) {
-        const size_t worstCaseCount = byteLength;
-        return MakeFromRSXform(text, byteLength, {xform, worstCaseCount}, font, encoding);
-    }
-#endif
-
 private:
     friend class SkNVRefCnt<SkTextBlob>;
 

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

@@ -56,10 +56,10 @@ public:
     /** Returns the typeface's intrinsic style attributes. */
     SkFontStyle fontStyle() const;
 
-    /** Returns true if style() has the kBold bit set. */
+    /** Returns true if fontStyle() weight is at least semi bold */
     bool isBold() const;
 
-    /** Returns true if style() has the kItalic bit set. */
+    /** Returns true if fontStyle() is not upright. */
     bool isItalic() const;
 
     /** Returns true if the typeface claims to be fixed-pitch.
@@ -92,6 +92,12 @@ public:
      */
     int getVariationDesignParameters(SkSpan<SkFontParameters::Variation::Axis> parameters) const;
 
+    /** Returns true if the typeface is internally being fake bolded. */
+    bool isSyntheticBold() const;
+
+    /** Returns true if the typeface is internally being fake obliqued. */
+    bool isSyntheticOblique() const;
+
     /** Return a 32bit value for this typeface, unique for the underlying font
         data. Will never return 0.
      */
@@ -127,7 +133,7 @@ public:
     /** Write a unique signature to a stream, sufficient to reconstruct a
         typeface referencing the same font when Deserialize is called.
      */
-    void serialize(SkWStream*, SerializeBehavior = SerializeBehavior::kIncludeDataIfLocal) const;
+    bool serialize(SkWStream*, SerializeBehavior = SerializeBehavior::kIncludeDataIfLocal) const;
 
     /**
      *  Same as serialize(SkWStream*, ...) but returns the serialized data in SkData, instead of
@@ -176,7 +182,7 @@ public:
 
     /** Copy into tags[] (allocated by the caller) the list of table tags in
      *  the font, and return the number. This will be the same as CountTables()
-     *  or 0 if an error occured. If tags is empty, this only returns the count
+     *  or 0 if an error occurred. If tags is empty, this only returns the count
      *  (the same as calling countTables()).
      */
     int readTableTags(SkSpan<SkFontTableTag> tags) const;
@@ -190,7 +196,7 @@ public:
      *  (which for most truetype tables is big endian). If the table tag is
      *  not found, or there is an error copying the data, then 0 is returned.
      *  If this happens, it is possible that some or all of the memory pointed
-     *  to by data may have been written to, even though an error has occured.
+     *  to by data may have been written to, even though an error has occurred.
      *
      *  @param tag  The table tag whose contents are to be copied
      *  @param offset The offset in bytes into the table's contents where the
@@ -347,33 +353,6 @@ public:
             FactoryId id,
             sk_sp<SkTypeface> (*make)(std::unique_ptr<SkStreamAsset>, const SkFontArguments&));
 
-#ifdef SK_SUPPORT_UNSPANNED_APIS
-public:
-    int getVariationDesignPosition(SkFontArguments::VariationPosition::Coordinate coordinates[],
-                                   int count) const {
-        return this->getVariationDesignPosition({coordinates, count});
-    }
-    int getVariationDesignParameters(SkFontParameters::Variation::Axis parameters[],
-                                     int count) const {
-        return this->getVariationDesignParameters({parameters, count});
-    }
-    void unicharsToGlyphs(const SkUnichar unis[], int count, SkGlyphID glyphs[]) const {
-        this->unicharsToGlyphs({unis, count}, {glyphs, count});
-    }
-    int textToGlyphs(const void* text, size_t byteLength, SkTextEncoding encoding,
-                     SkGlyphID glyphs[], int maxGlyphCount) const {
-        return (int)this->textToGlyphs(text, byteLength, encoding, {glyphs, maxGlyphCount});
-    }
-    int getTableTags(SkFontTableTag tags[]) const {
-        const size_t count = tags ? MAX_REASONABLE_TABLE_COUNT : 0;
-        return this->readTableTags({tags, count});
-    }
-    bool getKerningPairAdjustments(const SkGlyphID glyphs[], int count,
-                                   int32_t adjustments[]) const {
-        return this->getKerningPairAdjustments({glyphs, count}, {adjustments, count});
-    }
-#endif
-
 protected:
     // needed until onGetTableTags() is updated to take a span
     enum { MAX_REASONABLE_TABLE_COUNT = (1 << 16) - 1 };
@@ -423,6 +402,9 @@ protected:
 
     virtual int onGetVariationDesignParameters(SkSpan<SkFontParameters::Variation::Axis>) const = 0;
 
+    virtual bool onIsSyntheticBold() const;
+    virtual bool onIsSyntheticOblique() const;
+
     virtual void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const = 0;
 
     virtual void onCharsToGlyphs(SkSpan<const SkUnichar>, SkSpan<SkGlyphID>) const = 0;

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

@@ -145,14 +145,6 @@
     #define SK_DISABLE_SDF_TEXT
 #endif
 
-#ifndef SK_DISABLE_LEGACY_SHADERCONTEXT
-#   define SK_ENABLE_LEGACY_SHADERCONTEXT
-#endif
-
-#ifndef SK_SUPPORT_MUTABLE_PATHEFFECT
-#   define SK_SUPPORT_MUTABLE_PATHEFFECT
-#endif
-
 #if defined(SK_BUILD_FOR_LIBFUZZER) || defined(SK_BUILD_FOR_AFL_FUZZ)
 #if !defined(SK_BUILD_FOR_FUZZER)
     #define SK_BUILD_FOR_FUZZER

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

@@ -7,8 +7,10 @@
 #include "include/core/SkMilestone.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkString.h"
 #include "include/private/base/SkAPI.h"
+#include "include/private/base/SkMacros.h"
 #include "include/private/base/SkNoncopyable.h"
 
 #include <cstdint>
@@ -24,29 +26,31 @@ class SkPDFStructTree;
 class SkPixmap;
 class SkWStream;
 
-#define SKPDF_STRING(X) SKPDF_STRING_IMPL(X)
-#define SKPDF_STRING_IMPL(X) #X
-
 namespace SkPDF {
 
-/** Attributes for nodes in the PDF tree. */
+/** Attributes for nodes in the PDF tree.
+ *
+ * Each attribute must have an owner (e.g. "Layout", "List", "Table", etc)
+ * and an attribute name (e.g. "BBox", "RowSpan", etc.) from PDF32000_2008 14.8.5,
+ * and then a value of the proper type according to the spec.
+ *
+ * Parameters of type `const char*` will not be copied and the pointers must remain valid until
+ * `SkDocument::close` or `SkDocument::abort` is called.
+ * Names are expected to be constants and are taken as `const char*`.
+ * Parameters not taken as `const char*` will be copied.
+ */
 class SK_API AttributeList : SkNoncopyable {
 public:
     AttributeList();
     ~AttributeList();
 
-    // Each attribute must have an owner (e.g. "Layout", "List", "Table", etc)
-    // and an attribute name (e.g. "BBox", "RowSpan", etc.) from PDF32000_2008 14.8.5,
-    // and then a value of the proper type according to the spec.
     void appendInt(const char* owner, const char* name, int value);
     void appendFloat(const char* owner, const char* name, float value);
-    void appendName(const char* owner, const char* attrName, const char* value);
-    void appendFloatArray(const char* owner,
-                          const char* name,
-                          const std::vector<float>& value);
-    void appendNodeIdArray(const char* owner,
-                           const char* attrName,
-                           const std::vector<int>& nodeIds);
+    void appendName(const char* owner, const char* name, const char* value);
+    void appendTextString(const char* owner, const char* name, const char* value);
+    void appendTextString(const char* owner, const char* name, SkString value);
+    void appendFloatArray(const char* owner, const char* name, SkSpan<const float> value);
+    void appendNodeIdArray(const char* owner, const char* name, SkSpan<const int> nodeIds);
 
 private:
     friend class ::SkPDFStructTree;
@@ -114,7 +118,7 @@ struct Metadata {
 
     /** The product that is converting this document to PDF.
     */
-    SkString fProducer = SkString("Skia/PDF m" SKPDF_STRING(SK_MILESTONE));
+    SkString fProducer = SkString("Skia/PDF m" SK_MACRO_STRINGIFY(SK_MILESTONE));
 
     /** The date and time the document was created.
         The zero default value represents an unknown/unset time.
@@ -264,6 +268,4 @@ static inline sk_sp<SkDocument> MakeDocument(SkWStream* stream) {
 
 }  // namespace SkPDF
 
-#undef SKPDF_STRING
-#undef SKPDF_STRING_IMPL
 #endif  // SkPDFDocument_DEFINED

package/cpp/skia/include/effects/SkDashPathEffect.h

@@ -38,12 +38,6 @@ public:
         Note: only affects stroked paths.
     */
     static sk_sp<SkPathEffect> Make(SkSpan<const SkScalar> intervals, SkScalar phase);
-
-#ifdef SK_SUPPORT_UNSPANNED_APIS
-    static sk_sp<SkPathEffect> Make(const SkScalar intervals[], int count, SkScalar phase) {
-        return intervals ? Make({intervals, count}, phase) : nullptr;
-    }
-#endif
 };
 
 #endif