@shopify/react-native-skia 0.1.213 → 0.1.214

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

@@ -47,10 +47,10 @@ class GlyphRunList;
 class AutoLayerForImageFilter;
 class GrRecordingContext;
 
-class SkBaseDevice;
 class SkBitmap;
 class SkBlender;
 class SkData;
+class SkDevice;
 class SkDrawable;
 class SkFont;
 class SkImage;
@@ -78,7 +78,7 @@ namespace SkRecords { class Draw; }
     SkCanvas provides an interface for drawing, and how the drawing is clipped and transformed.
     SkCanvas contains a stack of SkMatrix and clip values.
 
-    SkCanvas and SkPaint together provide the state to draw into SkSurface or SkBaseDevice.
+    SkCanvas and SkPaint together provide the state to draw into SkSurface or SkDevice.
     Each SkCanvas draw call transforms the geometry of the object by the concatenation of all
     SkMatrix values in the stack. The transformed geometry is clipped by the intersection
     of all of clip values in the stack. The SkCanvas draw calls use SkPaint to supply drawing
@@ -90,7 +90,7 @@ namespace SkRecords { class Draw; }
     SkCanvas generated by GPU surface uses Vulkan or OpenGL to draw to the GPU.
 
     To draw to a document, obtain SkCanvas from SVG canvas, document PDF, or SkPictureRecorder.
-    SkDocument based SkCanvas and other SkCanvas subclasses reference SkBaseDevice describing the
+    SkDocument based SkCanvas and other SkCanvas subclasses reference SkDevice describing the
     destination.
 
     SkCanvas can be constructed to draw to SkBitmap without first creating raster surface.
@@ -188,7 +188,7 @@ public:
 
     /** Private. For internal use only.
     */
-    explicit SkCanvas(sk_sp<SkBaseDevice> device);
+    explicit SkCanvas(sk_sp<SkDevice> device);
 
     /** Constructs a canvas that draws into bitmap.
         Sets kUnknown_SkPixelGeometry in constructed SkSurface.
@@ -281,15 +281,6 @@ public:
     */
     SkSurfaceProps getTopProps() const;
 
-    /** Triggers the immediate execution of all pending draw operations.
-        If SkCanvas is associated with GPU surface, resolves all pending GPU operations.
-        If SkCanvas is associated with raster surface, has no effect; raster draw
-        operations are never deferred.
-
-        DEPRECATED: Replace usage with GrDirectContext::flush()
-    */
-    void flush();
-
     /** Gets the size of the base or root layer in global canvas coordinates. The
         origin of the base layer is always (0,0). The area available for drawing may be
         smaller (due to clipping or saveLayer).
@@ -314,19 +305,20 @@ public:
     */
     sk_sp<SkSurface> makeSurface(const SkImageInfo& info, const SkSurfaceProps* props = nullptr);
 
-    /** Returns GPU context of the GPU surface associated with SkCanvas.
+    /** Returns Ganesh context of the GPU surface associated with SkCanvas.
 
         @return  GPU context, if available; nullptr otherwise
 
         example: https://fiddle.skia.org/c/@Canvas_recordingContext
      */
-    virtual GrRecordingContext* recordingContext();
+    virtual GrRecordingContext* recordingContext() const;
+
 
     /** Returns Recorder for the GPU surface associated with SkCanvas.
 
         @return  Recorder, if available; nullptr otherwise
      */
-    virtual skgpu::graphite::Recorder* recorder();
+    virtual skgpu::graphite::Recorder* recorder() const;
 
     /** Sometimes a canvas is owned by a surface. If it is, getSurface() will return a bare
      *  pointer to that surface, else this will return nullptr.
@@ -366,7 +358,7 @@ public:
 
     /** Returns true if SkCanvas has direct access to its pixels.
 
-        Pixels are readable when SkBaseDevice is raster. Pixels are not readable when SkCanvas
+        Pixels are readable when SkDevice is raster. Pixels are not readable when SkCanvas
         is returned from GPU surface, returned by SkDocument::beginPage, returned by
         SkPictureRecorder::beginRecording, or SkCanvas is the base of a utility class
         like DebugCanvas.
@@ -389,7 +381,7 @@ public:
         Copies each readable pixel intersecting both rectangles, without scaling,
         converting to dstInfo.colorType() and dstInfo.alphaType() if required.
 
-        Pixels are readable when SkBaseDevice is raster, or backed by a GPU.
+        Pixels are readable when SkDevice is raster, or backed by a GPU.
         Pixels are not readable when SkCanvas is returned by SkDocument::beginPage,
         returned by SkPictureRecorder::beginRecording, or SkCanvas is the base of a utility
         class like DebugCanvas.
@@ -426,7 +418,7 @@ public:
         Copies each readable pixel intersecting both rectangles, without scaling,
         converting to pixmap.colorType() and pixmap.alphaType() if required.
 
-        Pixels are readable when SkBaseDevice is raster, or backed by a GPU.
+        Pixels are readable when SkDevice is raster, or backed by a GPU.
         Pixels are not readable when SkCanvas is returned by SkDocument::beginPage,
         returned by SkPictureRecorder::beginRecording, or SkCanvas is the base of a utility
         class like DebugCanvas.
@@ -463,7 +455,7 @@ public:
         Copies each readable pixel intersecting both rectangles, without scaling,
         converting to bitmap.colorType() and bitmap.alphaType() if required.
 
-        Pixels are readable when SkBaseDevice is raster, or backed by a GPU.
+        Pixels are readable when SkDevice is raster, or backed by a GPU.
         Pixels are not readable when SkCanvas is returned by SkDocument::beginPage,
         returned by SkPictureRecorder::beginRecording, or SkCanvas is the base of a utility
         class like DebugCanvas.
@@ -500,7 +492,7 @@ public:
         Copies each readable pixel intersecting both rectangles, without scaling,
         converting to imageInfo().colorType() and imageInfo().alphaType() if required.
 
-        Pixels are writable when SkBaseDevice is raster, or backed by a GPU.
+        Pixels are writable when SkDevice is raster, or backed by a GPU.
         Pixels are not writable when SkCanvas is returned by SkDocument::beginPage,
         returned by SkPictureRecorder::beginRecording, or SkCanvas is the base of a utility
         class like DebugCanvas.
@@ -539,7 +531,7 @@ public:
         Copies each readable pixel intersecting both rectangles, without scaling,
         converting to imageInfo().colorType() and imageInfo().alphaType() if required.
 
-        Pixels are writable when SkBaseDevice is raster, or backed by a GPU.
+        Pixels are writable when SkDevice is raster, or backed by a GPU.
         Pixels are not writable when SkCanvas is returned by SkDocument::beginPage,
         returned by SkPictureRecorder::beginRecording, or SkCanvas is the base of a utility
         class like DebugCanvas.
@@ -1108,7 +1100,7 @@ public:
 
         Unlike getLocalClipBounds(), returned SkIRect is not outset.
 
-        @return  bounds of clip in SkBaseDevice coordinates
+        @return  bounds of clip in base device coordinates
 
         example: https://fiddle.skia.org/c/@Canvas_getDeviceClipBounds
     */
@@ -1169,13 +1161,13 @@ public:
         such as drawing with SkBlendMode, return undefined results. discard() does
         not change clip or SkMatrix.
 
-        discard() may do nothing, depending on the implementation of SkSurface or SkBaseDevice
+        discard() may do nothing, depending on the implementation of SkSurface or SkDevice
         that created SkCanvas.
 
         discard() allows optimized performance on subsequent draws by removing
-        cached data associated with SkSurface or SkBaseDevice.
+        cached data associated with SkSurface or SkDevice.
         It is not necessary to call discard() once done with SkCanvas;
-        any cached data is deleted when owning SkSurface or SkBaseDevice is deleted.
+        any cached data is deleted when owning SkSurface or SkDevice is deleted.
     */
     void discard() { this->onDiscard(); }
 
@@ -1982,11 +1974,11 @@ public:
     */
     void drawVertices(const sk_sp<SkVertices>& vertices, SkBlendMode mode, const SkPaint& paint);
 
-#if defined(SK_ENABLE_SKSL)
     /**
         Experimental, under active development, and subject to change without notice.
 
-        Draws a mesh using a user-defined specification (see SkMeshSpecification).
+        Draws a mesh using a user-defined specification (see SkMeshSpecification). Requires
+        a GPU backend or SkSL to be compiled in.
 
         SkBlender is ignored if SkMesh's specification does not output fragment shader color.
         Otherwise, it combines
@@ -2003,7 +1995,6 @@ public:
         @param paint     specifies the SkShader, used as SkVertices texture, may be nullptr
     */
     void drawMesh(const SkMesh& mesh, sk_sp<SkBlender> blender, const SkPaint& paint);
-#endif
 
     /** Draws a Coons patch: the interpolation of four cubics with shared corners,
         associating a color, and optionally a texture SkPoint, with each corner.
@@ -2192,7 +2183,6 @@ protected:
     virtual bool onAccessTopLayerPixels(SkPixmap* pixmap);
     virtual SkImageInfo onImageInfo() const;
     virtual bool onGetProps(SkSurfaceProps* props, bool top) const;
-    virtual void onFlush();
 
     // Subclass save/restore notifiers.
     // Overriders should call the corresponding INHERITED method up the inheritance chain.
@@ -2258,9 +2248,7 @@ protected:
 
     virtual void onDrawVerticesObject(const SkVertices* vertices, SkBlendMode mode,
                                       const SkPaint& paint);
-#ifdef SK_ENABLE_SKSL
     virtual void onDrawMesh(const SkMesh&, sk_sp<SkBlender>, const SkPaint&);
-#endif
     virtual void onDrawAnnotation(const SkRect& rect, const char key[], SkData* value);
     virtual void onDrawShadowRec(const SkPath&, const SkDrawShadowRec&);
 
@@ -2305,8 +2293,8 @@ private:
     // notify our surface (if we have one) that we are about to draw, so it
     // can perform copy-on-write or invalidate any cached images
     // returns false if the copy failed
-    bool SK_WARN_UNUSED_RESULT predrawNotify(bool willOverwritesEntireSurface = false);
-    bool SK_WARN_UNUSED_RESULT predrawNotify(const SkRect*, const SkPaint*, ShaderOverrideOpacity);
+    [[nodiscard]] bool predrawNotify(bool willOverwritesEntireSurface = false);
+    [[nodiscard]] bool predrawNotify(const SkRect*, const SkPaint*, ShaderOverrideOpacity);
 
     enum class CheckForOverwrite : bool {
         kNo = false,
@@ -2322,25 +2310,25 @@ private:
 
     // The bottom-most device in the stack, only changed by init(). Image properties and the final
     // canvas pixels are determined by this device.
-    SkBaseDevice* baseDevice() const {
-        SkASSERT(fBaseDevice);
-        return fBaseDevice.get();
+    SkDevice* rootDevice() const {
+        SkASSERT(fRootDevice);
+        return fRootDevice.get();
     }
 
     // The top-most device in the stack, will change within saveLayer()'s. All drawing and clipping
     // operations should route to this device.
-    SkBaseDevice* topDevice() const;
+    SkDevice* topDevice() const;
 
     // Canvases maintain a sparse stack of layers, where the top-most layer receives the drawing,
     // clip, and matrix commands. There is a layer per call to saveLayer() using the
     // kFullLayer_SaveLayerStrategy.
     struct Layer {
-        sk_sp<SkBaseDevice>  fDevice;
+        sk_sp<SkDevice>      fDevice;
         sk_sp<SkImageFilter> fImageFilter; // applied to layer *before* being drawn by paint
         SkPaint              fPaint;
         bool                 fDiscard;
 
-        Layer(sk_sp<SkBaseDevice> device, sk_sp<SkImageFilter> imageFilter, const SkPaint& paint);
+        Layer(sk_sp<SkDevice> device, sk_sp<SkImageFilter> imageFilter, const SkPaint& paint);
     };
 
     // Encapsulate state needed to restore from saveBehind()
@@ -2364,22 +2352,22 @@ private:
         std::unique_ptr<Layer> fLayer;
 
         // This points to the device of the top-most layer (which may be lower in the stack), or
-        // to the canvas's fBaseDevice. The MCRec does not own the device.
-        SkBaseDevice* fDevice;
+        // to the canvas's fRootDevice. The MCRec does not own the device.
+        SkDevice* fDevice;
 
         std::unique_ptr<BackImage> fBackImage;
         SkM44 fMatrix;
         int fDeferredSaveCount = 0;
 
-        MCRec(SkBaseDevice* device);
+        MCRec(SkDevice* device);
         MCRec(const MCRec* prev);
         ~MCRec();
 
-        void newLayer(sk_sp<SkBaseDevice> layerDevice,
+        void newLayer(sk_sp<SkDevice> layerDevice,
                       sk_sp<SkImageFilter> filter,
                       const SkPaint& restorePaint);
 
-        void reset(SkBaseDevice* device);
+        void reset(SkDevice* device);
     };
 
     // the first N recs that can fit here mean we won't call malloc
@@ -2393,7 +2381,7 @@ private:
     MCRec*      fMCRec;
 
     // Installed via init()
-    sk_sp<SkBaseDevice> fBaseDevice;
+    sk_sp<SkDevice> fRootDevice;
     const SkSurfaceProps fProps;
 
     int         fSaveCount;         // value returned by getSaveCount()
@@ -2441,6 +2429,7 @@ private:
     SkCanvas& operator=(const SkCanvas&) = delete;
 
     friend class sktext::gpu::Slug;
+    friend class SkPicturePlayback;
     /**
      * Convert a SkTextBlob to a sktext::gpu::Slug using the current canvas state.
      */
@@ -2473,7 +2462,7 @@ private:
     // needs gettotalclip()
     friend class SkCanvasStateUtils;
 
-    void init(sk_sp<SkBaseDevice>);
+    void init(sk_sp<SkDevice>);
 
     // All base onDrawX() functions should call this and skip drawing if it returns true.
     // If 'matrix' is non-null, it maps the paint's fast bounds before checking for quick rejection
@@ -2509,7 +2498,7 @@ private:
      * Must be 1.0 if 'compat' is kYes (i.e. any scale factor has already been baked into the
      * relative transforms between the devices).
      */
-    void internalDrawDeviceWithFilter(SkBaseDevice* src, SkBaseDevice* dst,
+    void internalDrawDeviceWithFilter(SkDevice* src, SkDevice* dst,
                                       const SkImageFilter* filter, const SkPaint& paint,
                                       DeviceCompatibleWithFilter compat,
                                       SkScalar scaleFactor = 1.f);
@@ -2554,8 +2543,6 @@ private:
     void validateClip() const;
 
     std::unique_ptr<sktext::GlyphRunBuilder> fScratchGlyphRunBuilder;
-
-    using INHERITED = SkRefCnt;
 };
 
 /** \class SkAutoCanvasRestore

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

@@ -9,11 +9,10 @@
 #define SkCapabilities_DEFINED
 
 #include "include/core/SkRefCnt.h"
-
-#ifdef SK_ENABLE_SKSL
+#include "include/core/SkTypes.h"
 #include "include/sksl/SkSLVersion.h"
+
 namespace SkSL { struct ShaderCaps; }
-#endif
 
 #if defined(SK_GRAPHITE)
 namespace skgpu::graphite { class Caps; }
@@ -23,9 +22,7 @@ class SK_API SkCapabilities : public SkRefCnt {
 public:
     static sk_sp<const SkCapabilities> RasterBackend();
 
-#ifdef SK_ENABLE_SKSL
     SkSL::Version skslVersion() const { return fSkSLVersion; }
-#endif
 
 protected:
 #if defined(SK_GRAPHITE)
@@ -34,11 +31,9 @@ protected:
 
     SkCapabilities() = default;
 
-#ifdef SK_ENABLE_SKSL
     void initSkCaps(const SkSL::ShaderCaps*);
 
     SkSL::Version fSkSLVersion = SkSL::Version::k100;
-#endif
 };
 
 #endif

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

@@ -79,7 +79,7 @@ static constexpr inline SkColor SkColorSetARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU
     @param a  alpha: transparent at zero, fully opaque at 255
     @return   color with transparency
 */
-static constexpr inline SkColor SK_WARN_UNUSED_RESULT SkColorSetA(SkColor c, U8CPU a) {
+[[nodiscard]] static constexpr inline SkColor SkColorSetA(SkColor c, U8CPU a) {
     return (c & 0x00FFFFFF) | (a << 24);
 }
 

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

@@ -64,6 +64,12 @@ public:
      */
     sk_sp<SkColorFilter> makeComposed(sk_sp<SkColorFilter> inner) const;
 
+    /** Return a colorfilter that will compute this filter in a specific color space. By default all
+     *  filters operate in the destination (surface) color space. This allows filters like Blend and
+     *  Matrix, or runtime color filters to perform their math in a known space.
+     */
+    sk_sp<SkColorFilter> makeWithWorkingColorSpace(sk_sp<SkColorSpace>) const;
+
     static sk_sp<SkColorFilter> Deserialize(const void* data, size_t size,
                                             const SkDeserialProcs* procs = nullptr);
 

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

@@ -10,6 +10,9 @@
 
 #include "include/core/SkBitmap.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+
+#include <cstdint>
 
 class SkReadBuffer;
 class SkWriteBuffer;

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

@@ -29,6 +29,8 @@ enum SkColorType : int {
     kRGB_101010x_SkColorType,  //!< pixel with 10 bits each for red, green, blue; in 32-bit word
     kBGR_101010x_SkColorType,  //!< pixel with 10 bits each for blue, green, red; in 32-bit word
     kBGR_101010x_XR_SkColorType, //!< pixel with 10 bits each for blue, green, red; in 32-bit word, extended range
+    kRGBA_10x6_SkColorType,    //!< pixel with 10 used bits (most significant) followed by 6 unused
+                               //   bits for red, green, blue, alpha; in 64-bit word
     kGray_8_SkColorType,       //!< pixel with grayscale level in 8-bit byte
     kRGBA_F16Norm_SkColorType, //!< pixel with half floats in [0,1] for red, green, blue, alpha;
                                //   in 64-bit word

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

@@ -8,11 +8,16 @@
 #ifndef SkContourMeasure_DEFINED
 #define SkContourMeasure_DEFINED
 
-#include "include/core/SkPath.h"
+#include "include/core/SkPoint.h"
 #include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/private/base/SkAPI.h"
 #include "include/private/base/SkTDArray.h"
 
-struct SkConic;
+#include <memory>
+
+class SkMatrix;
+class SkPath;
 
 class SK_API SkContourMeasure : public SkRefCnt {
 public:
@@ -23,8 +28,7 @@ public:
     /** Pins distance to 0 <= distance <= length(), and then computes the corresponding
      *  position and tangent.
      */
-    bool SK_WARN_UNUSED_RESULT getPosTan(SkScalar distance, SkPoint* position,
-                                         SkVector* tangent) const;
+    [[nodiscard]] bool getPosTan(SkScalar distance, SkPoint* position, SkVector* tangent) const;
 
     enum MatrixFlags {
         kGetPosition_MatrixFlag     = 0x01,
@@ -37,8 +41,8 @@ public:
      Returns false if there is no path, or a zero-length path was specified, in which case
      matrix is unchanged.
      */
-    bool SK_WARN_UNUSED_RESULT getMatrix(SkScalar distance, SkMatrix* matrix,
-                                         MatrixFlags flags = kGetPosAndTan_MatrixFlag) const;
+    [[nodiscard]] bool getMatrix(SkScalar distance, SkMatrix* matrix,
+                                 MatrixFlags flags = kGetPosAndTan_MatrixFlag) const;
 
     /** Given a start and stop distance, return in dst the intervening segment(s).
      If the segment is zero-length, return false, else return true.
@@ -46,8 +50,8 @@ public:
      then return false (and leave dst untouched).
      Begin the segment with a moveTo if startWithMoveTo is true
      */
-    bool SK_WARN_UNUSED_RESULT getSegment(SkScalar startD, SkScalar stopD, SkPath* dst,
-                                          bool startWithMoveTo) const;
+    [[nodiscard]] bool getSegment(SkScalar startD, SkScalar stopD, SkPath* dst,
+                                  bool startWithMoveTo) const;
 
     /** Return true if the contour is closed()
      */

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

@@ -10,6 +10,7 @@
 
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
+#include "include/private/base/SkAPI.h"
 
 class SkCanvas;
 class SkWStream;

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

@@ -8,17 +8,26 @@
 #ifndef SkFont_DEFINED
 #define SkFont_DEFINED
 
-#include "include/core/SkFontTypes.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypeface.h"
-#include "include/private/base/SkTemplates.h"
+#include "include/core/SkTypes.h"
+#include "include/private/base/SkTo.h"
+#include "include/private/base/SkTypeTraits.h"
 
+#include <cstddef>
+#include <cstdint>
+#include <type_traits>
 #include <vector>
 
 class SkMatrix;
 class SkPaint;
 class SkPath;
+enum class SkFontHinting;
+enum class SkTextEncoding;
 struct SkFontMetrics;
+struct SkPoint;
 
 /** \class SkFont
     SkFont controls options applied when drawing and measuring text.

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

@@ -8,18 +8,17 @@
 #ifndef SkFontMgr_DEFINED
 #define SkFontMgr_DEFINED
 
-#include "include/core/SkFontArguments.h"
-#include "include/core/SkFontStyle.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkTypes.h"
 
 #include <memory>
 
 class SkData;
-class SkFontData;
+class SkFontStyle;
 class SkStreamAsset;
 class SkString;
 class SkTypeface;
+struct SkFontArguments;
 
 class SK_API SkFontStyleSet : public SkRefCnt {
 public:

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

@@ -9,13 +9,15 @@
 #define SkGraphics_DEFINED
 
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 
 class SkData;
 class SkImageGenerator;
 class SkOpenTypeSVGDecoder;
-class SkPath;
 class SkTraceMemoryDump;
 
 class SK_API SkGraphics {
@@ -149,18 +151,6 @@ public:
             std::unique_ptr<SkOpenTypeSVGDecoder> (*)(const uint8_t* svg, size_t length);
     static OpenTypeSVGDecoderFactory SetOpenTypeSVGDecoderFactory(OpenTypeSVGDecoderFactory);
     static OpenTypeSVGDecoderFactory GetOpenTypeSVGDecoderFactory();
-
-    /**
-     *  Call early in main() to allow Skia to use a JIT to accelerate CPU-bound operations.
-     */
-    static void AllowJIT();
-};
-
-class SkAutoGraphics {
-public:
-    SkAutoGraphics() {
-        SkGraphics::Init();
-    }
 };
 
 #endif