@shopify/react-native-skia 2.4.6 → 2.4.14

package/cpp/skia/include/codec/SkJpegxlDecoder.h

@@ -31,7 +31,7 @@ SK_API bool IsJpegxl(const void*, size_t);
 SK_API std::unique_ptr<SkCodec> Decode(std::unique_ptr<SkStream>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
-SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
+SK_API std::unique_ptr<SkCodec> Decode(sk_sp<const SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 

package/cpp/skia/include/codec/SkPngDecoder.h

@@ -31,10 +31,17 @@ SK_API bool IsPng(const void*, size_t);
 SK_API std::unique_ptr<SkCodec> Decode(std::unique_ptr<SkStream>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
-SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
+SK_API std::unique_ptr<SkCodec> Decode(sk_sp<const SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 
+// TODO: remove after client migration
+inline std::unique_ptr<SkCodec> Decode(sk_sp<SkData> data,
+                                       SkCodec::Result* result,
+                                       SkCodecs::DecodeContext ctx = nullptr) {
+    return Decode(sk_sp<const SkData>(static_cast<const SkData*>(data.release())), result, ctx);
+}
+
 inline constexpr SkCodecs::Decoder Decoder() {
     return { "png", IsPng, Decode };
 }

package/cpp/skia/include/codec/SkRawDecoder.h

@@ -36,7 +36,7 @@ inline bool IsRaw(const void*, size_t) {
 SK_API std::unique_ptr<SkCodec> Decode(std::unique_ptr<SkStream>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
-SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
+SK_API std::unique_ptr<SkCodec> Decode(sk_sp<const SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 

package/cpp/skia/include/codec/SkWbmpDecoder.h

@@ -31,7 +31,7 @@ SK_API bool IsWbmp(const void*, size_t);
 SK_API std::unique_ptr<SkCodec> Decode(std::unique_ptr<SkStream>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
-SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
+SK_API std::unique_ptr<SkCodec> Decode(sk_sp<const SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 

package/cpp/skia/include/codec/SkWebpDecoder.h

@@ -31,10 +31,17 @@ SK_API bool IsWebp(const void*, size_t);
 SK_API std::unique_ptr<SkCodec> Decode(std::unique_ptr<SkStream>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
-SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
+SK_API std::unique_ptr<SkCodec> Decode(sk_sp<const SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 
+// TODO: remove after client migration
+inline std::unique_ptr<SkCodec> Decode(sk_sp<SkData> data,
+                                       SkCodec::Result* result,
+                                       SkCodecs::DecodeContext ctx = nullptr) {
+    return Decode(sk_sp<const SkData>(static_cast<const SkData*>(data.release())), result, ctx);
+}
+
 inline constexpr SkCodecs::Decoder Decoder() {
     return { "webp", IsWebp, Decode };
 }

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

@@ -57,6 +57,7 @@ public:
 private:
     // TODO (b/412351769): Implement this so we can capture from a CPU Recorder.
     SkCanvas* makeCaptureCanvas(SkCanvas*) final { return nullptr; }
+    void createCaptureBreakpoint(SkSurface*) final {}
 };
 
 inline Recorder* AsRecorder(SkRecorder* recorder) {

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

@@ -2601,7 +2601,8 @@ private:
 
 protected:
     // For use by SkNoDrawCanvas (via SkCanvasVirtualEnforcer, which can't be a friend)
-    SkCanvas(const SkIRect& bounds);
+    explicit SkCanvas(const SkIRect& bounds);
+
 private:
     SkCanvas(const SkBitmap&, std::unique_ptr<SkRasterHandleAllocator>,
              SkRasterHandleAllocator::Handle, const SkSurfaceProps* props);
@@ -2748,7 +2749,7 @@ private:
     goes out of scope. Use this to guarantee that the canvas is restored to a known
     state.
 */
-class SkAutoCanvasRestore {
+class [[nodiscard]] SkAutoCanvasRestore {
 public:
 
     /** Preserves SkCanvas::save() count. Optionally saves SkCanvas clip and SkCanvas matrix.

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

@@ -50,7 +50,7 @@ public:
 private:
     friend class SkTableColorFilter; // for bitmap()
 
-    SkColorTable(const SkBitmap& table) : fTable(table) {}
+    explicit SkColorTable(const SkBitmap& table) : fTable(table) {}
 
     // The returned SkBitmap is immutable; attempting to modify its pixel data will trigger asserts
     // in debug builds and cause undefined behavior in release builds.

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

@@ -119,6 +119,10 @@ enum SkColorType : int {
     // Single channel data (16 bits) interpreted as alpha. RGB are 0.
     //   Bits: [A:15..0]
     kA16_unorm_SkColorType,
+    // Single channel data (16 bits) interpreted as red. G and B are forced to 0, alpha is forced to
+    // opaque.
+    //   Bits: [R:15..0]
+    kR16_unorm_SkColorType,
     // Two channel RG data (16 bits per channel) packed into a LE 32-bit word. B is forced to 0,
     // alpha is forced to opaque.
     //   Bits: [G:31..16 R:15..0]

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

@@ -62,7 +62,7 @@ public:
     void abort();
 
 protected:
-    SkDocument(SkWStream*);
+    explicit SkDocument(SkWStream*);
 
     // note: subclasses must call close() in their destructor, as the base class
     // cannot do this for them.

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

@@ -140,8 +140,13 @@ public:
      */
     static void PurgeAllCaches();
 
-    typedef std::unique_ptr<SkImageGenerator>
-                                            (*ImageGeneratorFromEncodedDataFactory)(sk_sp<SkData>);
+#if defined(SK_DISABLE_LEGACY_NONCONST_ENCODED_IMAGE_DATA)
+    using ImageGeneratorFromEncodedDataFactory =
+            std::unique_ptr<SkImageGenerator> (*)(sk_sp<const SkData>);
+#else
+    using ImageGeneratorFromEncodedDataFactory =
+            std::unique_ptr<SkImageGenerator> (*)(sk_sp<SkData>);
+#endif
 
     /**
      *  To instantiate images from encoded data, first looks at this runtime function-ptr. If it

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

@@ -103,7 +103,7 @@ SK_API sk_sp<SkImage> RasterFromCompressedTextureData(sk_sp<SkData> data,
 
     example: https://fiddle.skia.org/c/@Image_DeferredFromEncodedData
 */
-SK_API sk_sp<SkImage> DeferredFromEncodedData(sk_sp<SkData> encoded,
+SK_API sk_sp<SkImage> DeferredFromEncodedData(sk_sp<const SkData> encoded,
                                               std::optional<SkAlphaType> alphaType = std::nullopt);
 
 /** Creates SkImage from data returned by imageGenerator. The image data will not be created
@@ -739,7 +739,11 @@ public:
 
         example: https://fiddle.skia.org/c/@Image_refEncodedData
     */
+#if defined(SK_DISABLE_LEGACY_NONCONST_ENCODED_IMAGE_DATA)
+    sk_sp<const SkData> refEncodedData() const;
+#else
     sk_sp<SkData> refEncodedData() const;
+#endif
 
     struct RequiredProperties {
         bool fMipmapped = false;

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

@@ -37,9 +37,7 @@ public:
      *  If non-NULL is returned, the caller is responsible for calling
      *  unref() on the data when it is finished.
      */
-    sk_sp<SkData> refEncodedData() {
-        return this->onRefEncodedData();
-    }
+    sk_sp<const SkData> refEncodedData() { return this->onRefEncodedData(); }
 
     /**
      *  Return the ImageInfo associated with this generator.
@@ -118,7 +116,11 @@ protected:
 
     SkImageGenerator(const SkImageInfo& info, uint32_t uniqueId = kNeedNewImageUniqueID);
 
+#if defined(SK_DISABLE_LEGACY_NONCONST_ENCODED_IMAGE_DATA)
+    virtual sk_sp<const SkData> onRefEncodedData() { return nullptr; }
+#else
     virtual sk_sp<SkData> onRefEncodedData() { return nullptr; }
+#endif
     struct Options {};
     virtual bool onGetPixels(const SkImageInfo&, void*, size_t, const Options&) { return false; }
     virtual bool onIsValid(SkRecorder*) const { return true; }

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

@@ -19,8 +19,8 @@ struct SkRect;
 struct SK_API SkV2 {
     float x, y;
 
-    bool operator==(const SkV2 v) const { return x == v.x && y == v.y; }
-    bool operator!=(const SkV2 v) const { return !(*this == v); }
+    bool operator==(SkV2 v) const { return x == v.x && y == v.y; }
+    bool operator!=(SkV2 v) const { return !(*this == v); }
 
     static SkScalar   Dot(SkV2 a, SkV2 b) { return a.x * b.x + a.y * b.y; }
     static SkScalar Cross(SkV2 a, SkV2 b) { return a.x * b.y - a.y * b.x; }
@@ -166,7 +166,7 @@ public:
     enum Uninitialized_Constructor {
         kUninitialized_Constructor
     };
-    SkM44(Uninitialized_Constructor) {}
+    explicit SkM44(Uninitialized_Constructor) {}
 
     enum NaN_Constructor {
         kNaN_Constructor

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

@@ -28,17 +28,6 @@ struct SkSize;
 // Remove when clients are updated to live without this
 #define SK_SUPPORT_LEGACY_MATRIX_RECTTORECT
 
-#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
     SkPoint and vectors with translation, scaling, skewing, rotation, and
@@ -1506,18 +1495,6 @@ public:
     */
     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.
 

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

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

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

@@ -44,7 +44,7 @@ struct SkRect;
 class SK_API SkOverdrawCanvas : public SkCanvasVirtualEnforcer<SkNWayCanvas> {
 public:
     /* Does not take ownership of canvas */
-    SkOverdrawCanvas(SkCanvas*);
+    explicit SkOverdrawCanvas(SkCanvas*);
 
     void onDrawTextBlob(const SkTextBlob*, SkScalar, SkScalar, const SkPaint&) override;
     void onDrawGlyphRunList(