@shopify/react-native-skia 2.11.0-next.2 → 2.12.0-next.1

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

@@ -12,10 +12,10 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkCPUTypes.h"
-#include "include/private/base/SkFloatingPoint.h"
-#include "include/private/base/SkTo.h"
-#include "include/private/base/SkTypeTraits.h"
+#include "include/private/SkCPUTypes.h"
+#include "include/private/SkFloatingPoint.h"
+#include "include/private/SkTo.h"
+#include "include/private/SkTypeTraits.h"
 
 #include <cstdint>
 #include <optional>

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

@@ -17,9 +17,9 @@
 #include "include/core/SkScalar.h"
 #include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkDebug.h"
-#include "include/private/base/SkTo.h"
-#include "include/private/base/SkTypeTraits.h"
+#include "include/private/SkDebug.h"
+#include "include/private/SkTo.h"
+#include "include/private/SkTypeTraits.h"
 
 #include <atomic>
 #include <cstddef>
@@ -56,8 +56,7 @@ class SkPathData;
     outside the geometry. SkPath also describes the winding rule used to fill
     overlapping contours.
 
-    Internally, SkPath lazily computes metrics likes bounds and convexity. Call
-    SkPath::updateBoundsCache to make SkPath thread safe.
+    Internally, SkPath lazily computes convexity.
 */
 class SK_API SkPath {
 public:
@@ -510,19 +509,6 @@ public:
     */
     const SkRect& getBounds() const;
 
-    /** Updates internal bounds so that subsequent calls to getBounds() are instantaneous.
-        Unaltered copies of SkPath may also access cached bounds through getBounds().
-
-        For now, identical to calling getBounds() and ignoring the returned value.
-
-        Call to prepare SkPath subsequently drawn from multiple threads,
-        to avoid a race condition where each draw separately computes the bounds.
-    */
-    void updateBoundsCache() const {
-        // for now, just calling getBounds() is sufficient
-        this->getBounds();
-    }
-
     /** Returns minimum and maximum axes values of the lines and curves in SkPath.
         Returns (0, 0, 0, 0) if SkPath contains no points.
         Returned bounds width and height may be larger or smaller than area affected
@@ -1093,15 +1079,11 @@ public:
     static std::optional<SkPath> ReadFromMemory(const void* buffer, size_t length,
                                                 size_t* bytesRead = nullptr);
 
-    /** (See skbug.com/40032862)
-        Returns a non-zero, globally unique value. A different value is returned
+    /** Returns a non-zero, globally unique value. A different value is returned
         if verb array, SkPoint array, or conic weight changes.
 
         Setting SkPath::FillType does not change generation identifier.
 
-        Each time the path is modified, a different generation identifier will be returned.
-        SkPath::FillType does affect generation identifier on Android framework.
-
         @return  non-zero, globally unique value
 
         example: https://fiddle.skia.org/c/@Path_getGenerationID

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

@@ -19,7 +19,7 @@
 #include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkPathRef.h"
-#include "include/private/base/SkTArray.h"
+#include "include/private/SkTArray.h"
 
 #include <cstdint>
 #include <optional>
@@ -252,12 +252,14 @@ public:
 
         Appends kMove_Verb to verb array and (0, 0) to SkPoint array, if needed.
 
-        If w is finite and not one, appends kConic_Verb to verb array;
+        If w is finite, positive, and not one, appends kConic_Verb to verb array;
         and pt1, pt2 to SkPoint array; and w to conic weights.
 
         If w is one, appends kQuad_Verb to verb array, and
         pt1, pt2 to SkPoint array.
 
+        If w is zero, this is the same as lineTo(pt2)
+
         If w is not finite, appends kLine_Verb twice to verb array, and
         pt1, pt2 to SkPoint array.
 

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

@@ -13,7 +13,7 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkDebug.h"
+#include "include/private/SkDebug.h"
 
 class SkMatrix;
 class SkPath;

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

@@ -11,7 +11,7 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 #include <memory>
 

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

@@ -10,10 +10,10 @@
 
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSize.h"
+#include "include/private/SkAPI.h"
 #include "include/private/SkIDChangeListener.h"
 #include "include/private/SkPixelStorage.h"
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkTo.h"
+#include "include/private/SkTo.h"
 
 #include <atomic>
 #include <cstddef>
@@ -26,13 +26,11 @@ class SkDiscardableMemory;
     This class is the smart container for pixel memory, and is used with SkBitmap.
     This class can be shared/accessed between multiple threads.
 */
-class SK_API SkPixelRef : public SkPixelStorage, public SkRefCnt {
+class SK_API SkPixelRef : public SkPixelStorage {
 public:
     SkPixelRef(int width, int height, void* addr, size_t rowBytes);
     ~SkPixelRef() override;
 
-    Type type() const override;
-
     SkISize dimensions() const { return {fWidth, fHeight}; }
     int width() const { return fWidth; }
     int height() const { return fHeight; }

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

@@ -15,8 +15,8 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSamplingOptions.h"
 #include "include/core/SkSize.h"
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkAssert.h"
+#include "include/private/SkAPI.h"
+#include "include/private/SkAssert.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -165,6 +165,11 @@ public:
     */
     int height() const { return fInfo.height(); }
 
+    /**
+     *  Returns if the pixmap is empty (from its ImageInfo).
+     */
+    bool isEmpty() const { return fInfo.isEmpty(); }
+
     /**
      *  Return the dimensions of the pixmap (from its ImageInfo)
      */