@shopify/react-native-skia 2.3.0 → 2.3.5

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

@@ -21,7 +21,6 @@
 #include <optional>
 
 class GrDirectContext;
-class GrRecordingContext;
 class SkBitmap;
 class SkColorSpace;
 class SkData;
@@ -43,8 +42,6 @@ enum class SkTileMode;
 struct SkIPoint;
 struct SkSamplingOptions;
 
-namespace skgpu::graphite { class Recorder; }
-
 namespace SkImages {
 
 /** Caller data passed to RasterReleaseProc; may be nullptr. */
@@ -435,8 +432,8 @@ public:
     virtual size_t textureSize() const = 0;
 
     /** Returns true if SkImage can be drawn on either raster surface or GPU surface.
-        If context is nullptr, tests if SkImage draws on raster surface;
-        otherwise, tests if SkImage draws on GPU surface associated with context.
+        If recorder is nullptr, tests if SkImage draws on raster surface;
+        otherwise, tests if SkImage draws on the associated GPU surface.
 
         SkImage backed by GPU texture may become invalid if associated context is
         invalid. lazy image may be invalid and may not draw to raster surface or
@@ -447,7 +444,6 @@ public:
 
         example: https://fiddle.skia.org/c/@Image_isValid
     */
-    virtual bool isValid(GrRecordingContext* context) const = 0;
     virtual bool isValid(SkRecorder*) const = 0;
 
     /** \enum SkImage::CachingHint
@@ -745,29 +741,8 @@ public:
     */
     sk_sp<SkData> refEncodedData() const;
 
-    /** Returns subset of this image.
-
-        Returns nullptr if any of the following are true:
-          - Subset is empty
-          - Subset is not contained inside the image's bounds
-          - Pixels in the source image could not be read or copied
-          - This image is texture-backed and the provided context is null or does not match
-            the source image's context.
-
-        If the source image was texture-backed, the resulting image will be texture-backed also.
-        Otherwise, the returned image will be raster-backed.
-
-        @param direct  the GrDirectContext of the source image (nullptr is ok if the source image
-                       is not texture-backed).
-        @param subset  bounds of returned SkImage
-        @return        the subsetted image, or nullptr
-
-        example: https://fiddle.skia.org/c/@Image_makeSubset
-    */
-    virtual sk_sp<SkImage> makeSubset(GrDirectContext* direct, const SkIRect& subset) const = 0;
-
     struct RequiredProperties {
-        bool fMipmapped;
+        bool fMipmapped = false;
 
         bool operator==(const RequiredProperties& other) const {
             return fMipmapped == other.fMipmapped;
@@ -798,7 +773,7 @@ public:
         @param RequiredProperties  properties the returned SkImage must possess (e.g. mipmaps)
         @return                    the subsetted image, or nullptr
     */
-    virtual sk_sp<SkImage> makeSubset(skgpu::graphite::Recorder*,
+    virtual sk_sp<SkImage> makeSubset(SkRecorder*,
                                       const SkIRect& subset,
                                       RequiredProperties) const = 0;
 
@@ -881,25 +856,6 @@ public:
     */
     virtual bool isLazyGenerated() const = 0;
 
-    /** Creates SkImage in target SkColorSpace.
-        Returns nullptr if SkImage could not be created.
-
-        Returns original SkImage if it is in target SkColorSpace.
-        Otherwise, converts pixels from SkImage SkColorSpace to target SkColorSpace.
-        If SkImage colorSpace() returns nullptr, SkImage SkColorSpace is assumed to be sRGB.
-
-        If this image is texture-backed, the context parameter is required and must match the
-        context of the source image.
-
-        @param direct  The GrDirectContext in play, if it exists
-        @param target  SkColorSpace describing color range of returned SkImage
-        @return        created SkImage in target SkColorSpace
-
-        example: https://fiddle.skia.org/c/@Image_makeColorSpace
-    */
-    virtual sk_sp<SkImage> makeColorSpace(GrDirectContext* direct,
-                                          sk_sp<SkColorSpace> target) const = 0;
-
     /** Creates SkImage in target SkColorSpace.
         Returns nullptr if SkImage could not be created.
 
@@ -918,24 +874,6 @@ public:
                                           sk_sp<SkColorSpace> targetColorSpace,
                                           RequiredProperties) const = 0;
 
-    /** Experimental.
-        Creates SkImage in target SkColorType and SkColorSpace.
-        Returns nullptr if SkImage could not be created.
-
-        Returns original SkImage if it is in target SkColorType and SkColorSpace.
-
-        If this image is texture-backed, the context parameter is required and must match the
-        context of the source image.
-
-        @param direct           The GrDirectContext in play, if it exists
-        @param targetColorType  SkColorType of returned SkImage
-        @param targetColorSpace SkColorSpace of returned SkImage
-        @return                 created SkImage in target SkColorType and SkColorSpace
-    */
-    virtual sk_sp<SkImage> makeColorTypeAndColorSpace(GrDirectContext* direct,
-                                                      SkColorType targetColorType,
-                                                      sk_sp<SkColorSpace> targetCS) const = 0;
-
     /** Experimental.
         Creates SkImage in target SkColorType and SkColorSpace.
         Returns nullptr if SkImage could not be created.

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

@@ -18,7 +18,6 @@
 #include <cstddef>
 #include <cstdint>
 
-class GrRecordingContext;
 class SkRecorder;
 
 class SK_API SkImageGenerator {
@@ -51,9 +50,6 @@ public:
      *  Can this generator be used to produce images that will be drawable to the specified context
      *  (or to CPU, if context is nullptr)?
      */
-    bool isValid(GrRecordingContext* context) const {
-        return this->onIsValid(context);
-    }
     bool isValid(SkRecorder* recorder) const { return this->onIsValid(recorder); }
 
     /**
@@ -125,7 +121,6 @@ protected:
     virtual sk_sp<SkData> onRefEncodedData() { return nullptr; }
     struct Options {};
     virtual bool onGetPixels(const SkImageInfo&, void*, size_t, const Options&) { return false; }
-    virtual bool onIsValid(GrRecordingContext*) const { return true; }
     virtual bool onIsValid(SkRecorder*) const { return true; }
     virtual bool onIsProtected() const { return false; }
     virtual bool onQueryYUVAInfo(const SkYUVAPixmapInfo::SupportedDataTypes&,

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

@@ -20,6 +20,7 @@
 
 #include <cstdint>
 #include <cstring>
+#include <optional>
 
 struct SkRSXform;
 struct SkSize;
@@ -27,16 +28,16 @@ struct SkSize;
 // Remove when clients are updated to live without this
 #define SK_SUPPORT_LEGACY_MATRIX_RECTTORECT
 
-/**
- *  When we transform points through a matrix containing perspective (the bottom row is something
- *  other than 0,0,1), the bruteforce math can produce confusing results (since we might divide
- *  by 0, or a negative w value). By default, methods that map rects and paths will apply
- *  perspective clipping, but this can be changed by specifying kYes to those methods.
- */
+#ifndef SK_SUPPORT_LEGACY_APPLYPERSPECTIVECLIP
+    #define SK_SUPPORT_LEGACY_APPLYPERSPECTIVECLIP
+#endif
+
+#ifdef SK_SUPPORT_LEGACY_APPLYPERSPECTIVECLIP
 enum class SkApplyPerspectiveClip {
     kNo,    //!< Don't pre-clip the geometry before applying the (perspective) matrix
     kYes,   //!< Do pre-clip the geometry before applying the (perspective) matrix
 };
+#endif
 
 /** \class SkMatrix
     SkMatrix holds a 3x3 matrix for transforming coordinates. This allows mapping
@@ -97,6 +98,8 @@ public:
     [[nodiscard]] static SkMatrix Translate(SkVector t) { return Translate(t.x(), t.y()); }
     [[nodiscard]] static SkMatrix Translate(SkIVector t) { return Translate(t.x(), t.y()); }
 
+    [[nodiscard]] static SkMatrix ScaleTranslate(float sx, float sy, float tx, float ty);
+
     /** Sets SkMatrix to rotate by |deg| about a pivot point at (0, 0).
 
         @param deg  rotation angle in degrees (positive rotates clockwise)
@@ -141,25 +144,6 @@ public:
         kEnd_ScaleToFit,    //!< scales and aligns to right and bottom
     };
 
-    /** Returns SkMatrix set to scale and translate src to dst. ScaleToFit selects
-        whether mapping completely fills dst or preserves the aspect ratio, and how to
-        align src within dst. Returns the identity SkMatrix if src is empty. If dst is
-        empty, returns SkMatrix set to:
-
-            | 0 0 0 |
-            | 0 0 0 |
-            | 0 0 1 |
-
-        @param src  SkRect to map from
-        @param dst  SkRect to map to
-        @param mode How to handle the mapping
-        @return     SkMatrix mapping src to dst
-    */
-    [[nodiscard]] static SkMatrix RectToRect(const SkRect& src, const SkRect& dst,
-                                             ScaleToFit mode = kFill_ScaleToFit) {
-        return MakeRectToRect(src, dst, mode);
-    }
-
     /** Sets SkMatrix to:
 
             | scaleX  skewX transX |
@@ -1137,82 +1121,73 @@ public:
     */
     SkMatrix& postConcat(const SkMatrix& other);
 
-#ifndef SK_SUPPORT_LEGACY_MATRIX_RECTTORECT
-private:
-#endif
-    /** Sets SkMatrix to scale and translate src SkRect to dst SkRect. stf selects whether
-        mapping completely fills dst or preserves the aspect ratio, and how to align
-        src within dst. Returns false if src is empty, and sets SkMatrix to identity.
-        Returns true if dst is empty, and sets SkMatrix to:
-
-            | 0 0 0 |
-            | 0 0 0 |
-            | 0 0 1 |
-
-        @param src  SkRect to map from
-        @param dst  SkRect to map to
-        @return     true if SkMatrix can represent SkRect mapping
-
-        example: https://fiddle.skia.org/c/@Matrix_setRectToRect
-    */
-    bool setRectToRect(const SkRect& src, const SkRect& dst, ScaleToFit stf);
+    /** If possible, return a matrix that will transform the src rect to the dst rect.
+     *  If the src is empty, this will return {}.
+     *  If the dst is empty, this will return the zero matrix (degenerate).
+     */
+    static std::optional<SkMatrix> Rect2Rect(const SkRect& src, const SkRect& dst,
+                                             ScaleToFit = kFill_ScaleToFit);
 
-    /** Returns SkMatrix set to scale and translate src SkRect to dst SkRect. stf selects
-        whether mapping completely fills dst or preserves the aspect ratio, and how to
-        align src within dst. Returns the identity SkMatrix if src is empty. If dst is
-        empty, returns SkMatrix set to:
+    static SkMatrix RectToRectOrIdentity(const SkRect& src, const SkRect& dst,
+                                         ScaleToFit stf = kFill_ScaleToFit) {
+        return Rect2Rect(src, dst, stf).value_or(SkMatrix::I());
+    }
 
-            | 0 0 0 |
-            | 0 0 0 |
-            | 0 0 1 |
+#ifdef SK_SUPPORT_LEGACY_MATRIX_RECTTORECT
+    bool setRectToRect(const SkRect& src, const SkRect& dst, ScaleToFit stf) {
+        if (auto mx = Rect2Rect(src, dst, stf)) {
+            *this = *mx;
+            return true;
+        }
+        this->reset();
+        return false;
+    }
 
-        @param src  SkRect to map from
-        @param dst  SkRect to map to
-        @return     SkMatrix mapping src to dst
-    */
     static SkMatrix MakeRectToRect(const SkRect& src, const SkRect& dst, ScaleToFit stf) {
-        SkMatrix m;
-        m.setRectToRect(src, dst, stf);
-        return m;
+        if (auto mx = Rect2Rect(src, dst, stf)) {
+            return *mx;
+        }
+        return SkMatrix::I();
     }
-#ifndef SK_SUPPORT_LEGACY_MATRIX_RECTTORECT
-public:
-#endif
 
-    /** Sets SkMatrix to map src to dst. count must be zero or greater, and four or less.
+    [[nodiscard]] static SkMatrix RectToRect(const SkRect& src, const SkRect& dst,
+                                             ScaleToFit mode = kFill_ScaleToFit) {
+        return MakeRectToRect(src, dst, mode);
+    }
+#endif
 
-        If count is zero, sets SkMatrix to identity and returns true.
-        If count is one, sets SkMatrix to translate and returns true.
-        If count is two or more, sets SkMatrix to map SkPoint if possible; returns false
-        if SkMatrix cannot be constructed. If count is four, SkMatrix may include
-        perspective.
+    /** Compute a matrix from two polygons, such that if the matrix was applied
+     *  to the src polygon, it would produce the dst polygon.
+     *
+     *  If the size of the two spans are not equal, or if they are > 4, return {}.
+     *  If the resulting matrix is non-invertible, return {}.
+     *
+     *  example: https://fiddle.skia.org/c/@Matrix_setPolyToPoly
+     */
+    static std::optional<SkMatrix> PolyToPoly(SkSpan<const SkPoint> src, SkSpan<const SkPoint> dst);
 
-        @param src    SkPoint to map from
-        @param dst    SkPoint to map to
-        @param count  number of SkPoint in src and dst
-        @return       true if SkMatrix was constructed successfully
+    bool setPolyToPoly(SkSpan<const SkPoint> src, SkSpan<const SkPoint> dst) {
+        if (auto mx = PolyToPoly(src, dst)) {
+            *this = *mx;
+            return true;
+        }
+        return false;
+    }
 
-        example: https://fiddle.skia.org/c/@Matrix_setPolyToPoly
+    /*
+     * If this matrix is invertible, return its inverse, else return {}.
     */
-    bool setPolyToPoly(const SkPoint src[], const SkPoint dst[], int count);
-
-    /** Sets inverse to reciprocal matrix, returning true if SkMatrix can be inverted.
-        Geometrically, if SkMatrix maps from source to destination, inverse SkMatrix
-        maps from destination to source. If SkMatrix can not be inverted, inverse is
-        unchanged.
+    std::optional<SkMatrix> invert() const;
 
-        @param inverse  storage for inverted SkMatrix; may be nullptr
-        @return         true if SkMatrix can be inverted
-    */
+    // deprecated
     [[nodiscard]] bool invert(SkMatrix* inverse) const {
-        // Allow the trivial case to be inlined.
-        if (this->isIdentity()) {
+        if (auto inv = this->invert()) {
             if (inverse) {
-                inverse->reset();
+                *inverse = *inv;
             }
             return true;
         }
-        return this->invertNonIdentity(inverse);
+        return false;
     }
 
     /** Fills affine with identity values in column major order.
@@ -1427,7 +1402,7 @@ public:
                  y = this->getTranslateY();
         if (this->hasPerspective()) {
             SkScalar w = fMat[kMPersp2];
-            if (w) { w = 1 / w; }
+            if ((bool)w) { w = 1 / w; }
             x *= w;
             y *= w;
         }
@@ -1529,8 +1504,19 @@ public:
 
         example: https://fiddle.skia.org/c/@Matrix_mapRect
     */
-    bool mapRect(SkRect* dst, const SkRect& src,
-                 SkApplyPerspectiveClip pc = SkApplyPerspectiveClip::kYes) const;
+    bool mapRect(SkRect* dst, const SkRect& src) const;
+
+#ifdef SK_SUPPORT_LEGACY_APPLYPERSPECTIVECLIP
+    bool mapRect(SkRect* dst, const SkRect& src, SkApplyPerspectiveClip) const {
+        return this->mapRect(dst, src);
+    }
+    bool mapRect(SkRect* rect, SkApplyPerspectiveClip) const {
+        return this->mapRect(rect, *rect);
+    }
+    SkRect mapRect(const SkRect& src, SkApplyPerspectiveClip) const {
+        return this->mapRect(src);
+    }
+#endif
 
     /** Sets rect to bounds of rect corners mapped by SkMatrix.
         Returns true if mapped corners are computed rect corners.
@@ -1541,8 +1527,8 @@ public:
         @param pc    whether to apply perspective clipping
         @return      true if result is equivalent to mapped rect
     */
-    bool mapRect(SkRect* rect, SkApplyPerspectiveClip pc = SkApplyPerspectiveClip::kYes) const {
-        return this->mapRect(rect, *rect, pc);
+    bool mapRect(SkRect* rect) const {
+        return this->mapRect(rect, *rect);
     }
 
     /** Returns bounds of src corners mapped by SkMatrix.
@@ -1550,10 +1536,9 @@ public:
         @param src  rectangle to map
         @return     mapped bounds
     */
-    SkRect mapRect(const SkRect& src,
-                   SkApplyPerspectiveClip pc = SkApplyPerspectiveClip::kYes) const {
+    SkRect mapRect(const SkRect& src) const {
         SkRect dst;
-        (void)this->mapRect(&dst, src, pc);
+        (void)this->mapRect(&dst, src);
         return dst;
     }
 
@@ -1587,8 +1572,7 @@ public:
     */
     void mapRectToQuad(SkPoint dst[4], const SkRect& rect) const {
         // This could potentially be faster if we only transformed each x and y of the rect once.
-        rect.toQuad(dst);
-        this->mapPoints({dst, 4});
+        this->mapPoints({dst, 4}, rect.toQuad());
     }
 
     /** Sets dst to bounds of src corners mapped by SkMatrix. If matrix contains
@@ -1769,29 +1753,7 @@ public:
         @param ty  vertical translation to store
     */
     void setScaleTranslate(SkScalar sx, SkScalar sy, SkScalar tx, SkScalar ty) {
-        fMat[kMScaleX] = sx;
-        fMat[kMSkewX]  = 0;
-        fMat[kMTransX] = tx;
-
-        fMat[kMSkewY]  = 0;
-        fMat[kMScaleY] = sy;
-        fMat[kMTransY] = ty;
-
-        fMat[kMPersp0] = 0;
-        fMat[kMPersp1] = 0;
-        fMat[kMPersp2] = 1;
-
-        int mask = 0;
-        if (sx != 1 || sy != 1) {
-            mask |= kScale_Mask;
-        }
-        if (tx != 0.0f || ty != 0.0f) {
-            mask |= kTranslate_Mask;
-        }
-        if (sx != 0 && sy != 0) {
-            mask |= kRectStaysRect_Mask;
-        }
-        this->setTypeMask(mask);
+        *this = SkMatrix::ScaleTranslate(sx, sy, tx, ty);
     }
 
     /** Returns true if all elements of the matrix are finite. Returns false if any
@@ -1802,6 +1764,10 @@ public:
     bool isFinite() const { return SkIsFinite(fMat, 9); }
 
 #ifdef SK_SUPPORT_UNSPANNED_APIS
+    bool setPolyToPoly(const SkPoint src[], const SkPoint dst[], int count) {
+        return this->setPolyToPoly({src, count}, {dst, count});
+    }
+
     void mapPoints(SkPoint dst[], const SkPoint src[], int count) const {
         this->mapPoints({dst, count}, {src, count});
     }
@@ -1941,8 +1907,6 @@ private:
         return GetMapPtsProc(this->getType());
     }
 
-    [[nodiscard]] bool invertNonIdentity(SkMatrix* inverse) const;
-
     static bool Poly2Proc(const SkPoint[], SkMatrix*);
     static bool Poly3Proc(const SkPoint[], SkMatrix*);
     static bool Poly4Proc(const SkPoint[], SkMatrix*);

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

@@ -5,5 +5,5 @@
  * found in the LICENSE file.
  */
 #ifndef SK_MILESTONE
-#define SK_MILESTONE 139
+#define SK_MILESTONE 142
 #endif