@shopify/react-native-skia 0.1.212 → 0.1.214

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

@@ -8,23 +8,24 @@
 #ifndef SkMesh_DEFINED
 #define SkMesh_DEFINED
 
-#include "include/core/SkTypes.h"
-
-#ifdef SK_ENABLE_SKSL
-#include "include/core/SkAlphaType.h"
+#include "include/core/SkData.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSpan.h"
 #include "include/core/SkString.h"
 #include "include/effects/SkRuntimeEffect.h"
+#include "include/private/base/SkAPI.h"
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
+#include <string_view>
 #include <tuple>
 #include <vector>
 
 class GrDirectContext;
 class SkColorSpace;
-class SkData;
+enum SkAlphaType : int;
 
 namespace SkSL { struct Program; }
 
@@ -102,6 +103,7 @@ public:
     };
 
     using Uniform = SkRuntimeEffect::Uniform;
+    using Child = SkRuntimeEffect::Child;
 
     ~SkMeshSpecification();
 
@@ -166,13 +168,22 @@ public:
      */
     SkSpan<const Uniform> uniforms() const { return SkSpan(fUniforms); }
 
-    /** Returns pointer to the named uniform variable's description, or nullptr if not found. */
+    /**
+     * Provides basic info about individual children: names, indices and runtime effect type.
+     * TODO(b/40045302): SkMesh will currently reject mesh specifications that include child effects
+     */
+    SkSpan<const Child> children() const { return SkSpan(fChildren); }
+
+    /** Returns a pointer to the named child's description, or nullptr if not found. */
+    const Child* findChild(std::string_view name) const;
+
+    /** Returns a pointer to the named uniform variable's description, or nullptr if not found. */
     const Uniform* findUniform(std::string_view name) const;
 
-    /** Returns pointer to the named attribute, or nullptr if not found. */
+    /** Returns a pointer to the named attribute, or nullptr if not found. */
     const Attribute* findAttribute(std::string_view name) const;
 
-    /** Returns pointer to the named varying, or nullptr if not found. */
+    /** Returns a pointer to the named varying, or nullptr if not found. */
     const Varying* findVarying(std::string_view name) const;
 
     size_t stride() const { return fStride; }
@@ -200,6 +211,7 @@ private:
                         int passthroughLocalCoordsVaryingIndex,
                         uint32_t deadVaryingMask,
                         std::vector<Uniform> uniforms,
+                        std::vector<Child> children,
                         std::unique_ptr<const SkSL::Program>,
                         std::unique_ptr<const SkSL::Program>,
                         ColorType,
@@ -215,6 +227,7 @@ private:
     const std::vector<Attribute>               fAttributes;
     const std::vector<Varying>                 fVaryings;
     const std::vector<Uniform>                 fUniforms;
+    const std::vector<Child>                   fChildren;
     const std::unique_ptr<const SkSL::Program> fVS;
     const std::unique_ptr<const SkSL::Program> fFS;
     const size_t                               fStride;
@@ -230,18 +243,18 @@ private:
  * A vertex buffer, a topology, optionally an index buffer, and a compatible SkMeshSpecification.
  *
  * The data in the vertex buffer is expected to contain the attributes described by the spec
- * for vertexCount vertices beginning at vertexOffset. vertexOffset must be aligned to the
+ * for vertexCount vertices, beginning at vertexOffset. vertexOffset must be aligned to the
  * SkMeshSpecification's vertex stride. The size of the buffer must be at least vertexOffset +
  * spec->stride()*vertexCount (even if vertex attributes contains pad at the end of the stride). If
- * the specified bounds does not contain all the points output by the spec's vertex program when
- * applied to the vertices in the custom mesh then the result is undefined.
+ * the specified bounds do not contain all the points output by the spec's vertex program when
+ * applied to the vertices in the custom mesh, then the result is undefined.
  *
  * MakeIndexed may be used to create an indexed mesh. indexCount indices are read from the index
- * buffer at the specified offset which must be aligned to 2. The indices are always unsigned 16bit
- * integers. The index count must be at least 3.
+ * buffer at the specified offset, which must be aligned to 2. The indices are always unsigned
+ * 16-bit integers. The index count must be at least 3.
  *
- * If Make() is used the implicit index sequence is 0, 1, 2, 3, ... and vertexCount must be at least
- * 3.
+ * If Make() is used, the implicit index sequence is 0, 1, 2, 3, ... and vertexCount must be at
+ * least 3.
  *
  * Both Make() and MakeIndexed() take a SkData with the uniform values. See
  * SkMeshSpecification::uniformSize() and SkMeshSpecification::uniforms() for sizing and packing
@@ -249,7 +262,7 @@ private:
  */
 class SkMesh {
 public:
-    class IndexBuffer  : public SkRefCnt {
+    class IndexBuffer : public SkRefCnt {
     public:
         virtual size_t size() const = 0;
 
@@ -292,64 +305,27 @@ public:
     SkMesh& operator=(const SkMesh&);
     SkMesh& operator=(SkMesh&&);
 
-    /**
-     * Makes an index buffer to be used with SkMeshes. The buffer may be CPU- or GPU-backed
-     * depending on whether GrDirectContext* is nullptr.
-     *
-     * @param  GrDirectContext*  If nullptr a CPU-backed object is returned. Otherwise, the data is
-     *                           uploaded to the GPU and a GPU-backed buffer is returned. It may
-     *                           only be used to draw into SkSurfaces that are backed by the passed
-     *                           GrDirectContext.
-     * @param  data              The data used to populate the buffer, or nullptr to create a zero-
-     *                           initialized buffer.
-     * @param  size              Both the size of the data in 'data' and the size of the resulting
-     *                           buffer.
-     */
-    static sk_sp<IndexBuffer> MakeIndexBuffer(GrDirectContext*, const void* data, size_t size);
-
-    /**
-     * Makes a copy of an index buffer. The implementation currently only supports a CPU-backed
-     * source buffer.
-     */
-    static sk_sp<IndexBuffer> CopyIndexBuffer(GrDirectContext*, sk_sp<IndexBuffer>);
-
-    /**
-     * Makes a vertex buffer to be used with SkMeshes. The buffer may be CPU- or GPU-backed
-     * depending on whether GrDirectContext* is nullptr.
-     *
-     * @param  GrDirectContext*  If nullptr a CPU-backed object is returned. Otherwise, the data is
-     *                           uploaded to the GPU and a GPU-backed buffer is returned. It may
-     *                           only be used to draw into SkSurfaces that are backed by the passed
-     *                           GrDirectContext.
-     * @param  data              The data used to populate the buffer, or nullptr to create a zero-
-     *                           initialized buffer.
-     * @param  size              Both the size of the data in 'data' and the size of the resulting
-     *                           buffer.
-     */
-    static sk_sp<VertexBuffer> MakeVertexBuffer(GrDirectContext*, const void*, size_t size);
-
-    /**
-     * Makes a copy of a vertex buffer. The implementation currently only supports a CPU-backed
-     * source buffer.
-     */
-    static sk_sp<VertexBuffer> CopyVertexBuffer(GrDirectContext*, sk_sp<VertexBuffer>);
-
     enum class Mode { kTriangles, kTriangleStrip };
 
     struct Result;
 
+    using ChildPtr = SkRuntimeEffect::ChildPtr;
+
     /**
      * Creates a non-indexed SkMesh. The returned SkMesh can be tested for validity using
      * SkMesh::isValid(). An invalid mesh simply fails to draws if passed to SkCanvas::drawMesh().
      * If the mesh is invalid the returned string give contain the reason for the failure (e.g. the
      * vertex buffer was null or uniform data too small).
      */
+
+    // TODO(b/40045302): support for `children` is a work-in-progress
     static Result Make(sk_sp<SkMeshSpecification>,
                        Mode,
                        sk_sp<VertexBuffer>,
                        size_t vertexCount,
                        size_t vertexOffset,
                        sk_sp<const SkData> uniforms,
+                       SkSpan<ChildPtr> children,
                        const SkRect& bounds);
 
     /**
@@ -358,6 +334,8 @@ public:
      * If the mesh is invalid the returned string give contain the reason for the failure (e.g. the
      * index buffer was null or uniform data too small).
      */
+
+    // TODO(b/40045302): support for `children` is a work-in-progress
     static Result MakeIndexed(sk_sp<SkMeshSpecification>,
                               Mode,
                               sk_sp<VertexBuffer>,
@@ -367,6 +345,7 @@ public:
                               size_t indexCount,
                               size_t indexOffset,
                               sk_sp<const SkData> uniforms,
+                              SkSpan<ChildPtr> children,
                               const SkRect& bounds);
 
     sk_sp<SkMeshSpecification> refSpec() const { return fSpec; }
@@ -389,13 +368,13 @@ public:
     sk_sp<const SkData> refUniforms() const { return fUniforms; }
     const SkData* uniforms() const { return fUniforms.get(); }
 
+    SkSpan<const ChildPtr> children() const { return SkSpan(fChildren); }
+
     SkRect bounds() const { return fBounds; }
 
     bool isValid() const;
 
 private:
-    friend struct SkMeshPriv;
-
     std::tuple<bool, SkString> validate() const;
 
     sk_sp<SkMeshSpecification> fSpec;
@@ -404,6 +383,7 @@ private:
     sk_sp<IndexBuffer>  fIB;
 
     sk_sp<const SkData> fUniforms;
+    std::vector<ChildPtr> fChildren;
 
     size_t fVOffset = 0;  // Must be a multiple of spec->stride()
     size_t fVCount  = 0;
@@ -418,6 +398,36 @@ private:
 
 struct SkMesh::Result { SkMesh mesh; SkString error; };
 
-#endif  // SK_ENABLE_SKSL
+namespace SkMeshes {
+/**
+ * Makes a CPU-backed index buffer to be used with SkMeshes.
+ *
+ * @param  data              The data used to populate the buffer, or nullptr to create a zero-
+ *                           initialized buffer.
+ * @param  size              Both the size of the data in 'data' and the size of the resulting
+ *                           buffer.
+ */
+SK_API sk_sp<SkMesh::IndexBuffer> MakeIndexBuffer(const void* data, size_t size);
+
+/**
+ * Makes a copy of an index buffer. The copy will be CPU-backed.
+ */
+SK_API sk_sp<SkMesh::IndexBuffer> CopyIndexBuffer(sk_sp<SkMesh::IndexBuffer>);
+
+/**
+ * Makes a CPU-backed vertex buffer to be used with SkMeshes.
+ *
+ * @param  data              The data used to populate the buffer, or nullptr to create a zero-
+ *                           initialized buffer.
+ * @param  size              Both the size of the data in 'data' and the size of the resulting
+ *                           buffer.
+ */
+SK_API sk_sp<SkMesh::VertexBuffer> MakeVertexBuffer(const void*, size_t size);
+
+/**
+ * Makes a copy of a vertex buffer.  The copy will be CPU-backed.
+ */
+SK_API sk_sp<SkMesh::VertexBuffer> CopyVertexBuffer(sk_sp<SkMesh::VertexBuffer>);
+}  // namespace SkMeshes
 
 #endif

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

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

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

@@ -8,9 +8,34 @@
 #ifndef SkOverdrawCanvas_DEFINED
 #define SkOverdrawCanvas_DEFINED
 
+#include "include/core/SkCanvas.h"
 #include "include/core/SkCanvasVirtualEnforcer.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkSamplingOptions.h"
+#include "include/core/SkScalar.h"
+#include "include/private/base/SkAPI.h"
 #include "include/utils/SkNWayCanvas.h"
 
+#include <cstddef>
+
+class SkData;
+class SkDrawable;
+class SkImage;
+class SkMatrix;
+class SkPath;
+class SkPicture;
+class SkRRect;
+class SkRegion;
+class SkTextBlob;
+class SkVertices;
+enum class SkBlendMode;
+namespace sktext { class GlyphRunList; }
+struct SkDrawShadowRec;
+struct SkPoint;
+struct SkRSXform;
+struct SkRect;
+
 /**
  *  Captures all drawing commands.  Rather than draw the actual content, this device
  *  increments the alpha channel of each pixel every time it would have been touched

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

@@ -598,7 +598,7 @@ public:
 
     /**     (to be made private)
         Returns true if SkPaint does not include elements requiring extensive computation
-        to compute SkBaseDevice bounds of drawn geometry. For instance, SkPaint with SkPathEffect
+        to compute device bounds of drawn geometry. For instance, SkPaint with SkPathEffect
         always returns false.
 
         @return  true if SkPaint allows for fast computation of bounds

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

@@ -330,10 +330,10 @@ public:
 
     /** Specifies whether SkPath is volatile; whether it will be altered or discarded
         by the caller after it is drawn. SkPath by default have volatile set false, allowing
-        SkBaseDevice to attach a cache of data which speeds repeated drawing.
+        Skia to attach a cache of data which speeds repeated drawing.
 
         Mark temporary paths, discarded or modified after use, as volatile
-        to inform SkBaseDevice that the path need not be cached.
+        to inform Skia that the path need not be cached.
 
         Mark animating SkPath volatile to improve performance.
         Mark unchanging SkPath non-volatile to improve repeated rendering.
@@ -1248,8 +1248,16 @@ public:
         the last contour or start a new contour.
     */
     enum AddPathMode {
-        kAppend_AddPathMode, //!< appended to destination unaltered
-        kExtend_AddPathMode, //!< add line if prior contour is not closed
+        /** Contours are appended to the destination path as new contours.
+        */
+        kAppend_AddPathMode,
+        /** Extends the last contour of the destination path with the first countour
+            of the source path, connecting them with a line.  If the last contour is
+            closed, a new empty contour starting at its start point is extended instead.
+            If the destination path is empty, the result is the source path.
+            The last path of the result is closed only if the last path of the source is.
+        */
+        kExtend_AddPathMode,
     };
 
     /** Appends src to SkPath, offset by (dx, dy).

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

@@ -42,8 +42,7 @@ public:
         Returns false if there is no path, or a zero-length path was specified, in which case
         position and tangent are unchanged.
     */
-    bool SK_WARN_UNUSED_RESULT getPosTan(SkScalar distance, SkPoint* position,
-                                         SkVector* tangent);
+    [[nodiscard]] bool getPosTan(SkScalar distance, SkPoint* position, SkVector* tangent);
 
     enum MatrixFlags {
         kGetPosition_MatrixFlag     = 0x01,
@@ -56,8 +55,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);
+    [[nodiscard]] bool getMatrix(SkScalar distance, SkMatrix* matrix,
+                                 MatrixFlags flags = kGetPosAndTan_MatrixFlag);
 
     /** Given a start and stop distance, return in dst the intervening segment(s).
         If the segment is zero-length, return false, else return true.

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

@@ -10,19 +10,24 @@
 
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
-#include "include/core/SkSamplingOptions.h"
-#include "include/core/SkShader.h"
-#include "include/core/SkTileMode.h"
+#include "include/core/SkShader.h"  // IWYU pragma: keep
 #include "include/core/SkTypes.h"
 
+#include <atomic>
+#include <cstddef>
+#include <cstdint>
+
 class SkCanvas;
 class SkData;
-struct SkDeserialProcs;
-class SkImage;
 class SkMatrix;
-struct SkSerialProcs;
 class SkStream;
 class SkWStream;
+enum class SkFilterMode;
+struct SkDeserialProcs;
+struct SkSerialProcs;
+
+// TODO(kjlubick) Remove this after cleaning up clients
+#include "include/core/SkTileMode.h"  // IWYU pragma: keep
 
 /** \class SkPicture
     SkPicture records drawing commands made to SkCanvas. The command stream may be
@@ -157,6 +162,10 @@ public:
         may be used to provide user context to procs->fPictureProc; procs->fPictureProc
         is called with a pointer to SkPicture and user context.
 
+        The default behavior for serializing SkImages is to encode a nullptr. Should
+        clients want to, for example, encode these SkImages as PNGs so they can be
+        deserialized, they must provide SkSerialProcs with the fImageProc set to do so.
+
         @param procs  custom serial data encoders; may be nullptr
         @return       storage containing serialized SkPicture
 
@@ -171,6 +180,10 @@ public:
         may be used to provide user context to procs->fPictureProc; procs->fPictureProc
         is called with a pointer to SkPicture and user context.
 
+        The default behavior for serializing SkImages is to encode a nullptr. Should
+        clients want to, for example, encode these SkImages as PNGs so they can be
+        deserialized, they must provide SkSerialProcs with the fImageProc set to do so.
+
         @param stream  writable serial data stream
         @param procs   custom serial data encoders; may be nullptr
 

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

@@ -8,9 +8,10 @@
 #ifndef SkPictureRecorder_DEFINED
 #define SkPictureRecorder_DEFINED
 
-#include "include/core/SkBBHFactory.h"
-#include "include/core/SkPicture.h"
+#include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/private/base/SkAPI.h"
 
 #include <memory>
 
@@ -20,9 +21,11 @@ namespace android {
 };
 #endif
 
+class SkBBHFactory;
+class SkBBoxHierarchy;
 class SkCanvas;
 class SkDrawable;
-class SkPictureRecord;
+class SkPicture;
 class SkRecord;
 class SkRecorder;
 
@@ -31,9 +34,6 @@ public:
     SkPictureRecorder();
     ~SkPictureRecorder();
 
-    enum FinishFlags {
-    };
-
     /** Returns the canvas that records the drawing commands.
         @param bounds the cull rect used when recording this picture. Any drawing the falls outside
                       of this rect is undefined, and may be drawn or it may not.

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

@@ -17,7 +17,6 @@
 #include "include/core/SkSize.h"
 #include "include/private/base/SkAPI.h"
 #include "include/private/base/SkAssert.h"
-#include "include/private/base/SkAttributes.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -115,7 +114,7 @@ public:
 
     /** Deprecated.
     */
-    bool SK_WARN_UNUSED_RESULT reset(const SkMask& mask);
+    [[nodiscard]] bool reset(const SkMask& mask);
 
     /** Sets subset width, height, pixel address to intersection of SkPixmap with area,
         if intersection is not empty; and return true. Otherwise, leave subset unchanged
@@ -127,7 +126,7 @@ public:
         @param area    bounds to intersect with SkPixmap
         @return        true if intersection of SkPixmap and area is not empty
     */
-    bool SK_WARN_UNUSED_RESULT extractSubset(SkPixmap* subset, const SkIRect& area) const;
+    [[nodiscard]] bool extractSubset(SkPixmap* subset, const SkIRect& area) const;
 
     /** Returns width, height, SkAlphaType, SkColorType, and SkColorSpace.
 

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

@@ -394,7 +394,7 @@ public:
         @param dy  offset added to rect().fTop and rect().fBottom
         @return    SkRRect bounds offset by (dx, dy), with unchanged corner radii
     */
-    SkRRect SK_WARN_UNUSED_RESULT makeOffset(SkScalar dx, SkScalar dy) const {
+    [[nodiscard]] SkRRect makeOffset(SkScalar dx, SkScalar dy) const {
         return SkRRect(fRect.makeOffset(dx, dy), fRadii, fType);
     }