npm - @shopify/react-native-skia - Versions diffs - 2.11.0-next.2 → 2.11.1 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (414) hide show

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

@@ -31,9 +31,10 @@
 #include "include/core/SkSurfaceProps.h"
 #include "include/core/SkTileMode.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkCPUTypes.h"
-#include "include/private/base/SkDeque.h"
-#include "include/private/base/SkTArray.h"
+#include "include/private/SkCPUTypes.h"
+#include "include/private/SkDeque.h"
+#include "include/private/SkEnumBitMask.h"
+#include "include/private/SkTArray.h"
 #include <cstddef>
 #include <cstdint>
@@ -45,11 +46,6 @@
 #define SK_SUPPORT_LEGACY_GETTOTALMATRIX
 #endif
-namespace sktext {
-class GlyphRunBuilder;
-class GlyphRunList;
-}
 class AutoLayerForImageFilter;
 class GrRecordingContext;
@@ -81,6 +77,12 @@ struct SkDrawShadowRec;
 template<typename E>
 class SkEnumBitMask;
+namespace sktext {
+class GlyphRunBuilder;
+class GlyphRun;
+class GlyphRunList;
+}  // namespace sktext
 namespace skgpu::graphite { class Recorder; }
 namespace sktext::gpu { class Slug; }
 namespace SkRecords { class Draw; }
@@ -2415,11 +2417,7 @@ private:
         kCheckForOverwrite       = 4, // Check if the draw would overwrite the entire surface
         kSkipMaskFilterAutoLayer = 8, // Do not apply mask filters in the AutoLayer
     };
-    // Inlined SK_DECL_BITMASK_OPS_FRIENDS to avoid including SkEnumBitMask.h
-    friend constexpr SkEnumBitMask<PredrawFlags> operator|(PredrawFlags, PredrawFlags);
-    friend constexpr SkEnumBitMask<PredrawFlags> operator&(PredrawFlags, PredrawFlags);
-    friend constexpr SkEnumBitMask<PredrawFlags> operator^(PredrawFlags, PredrawFlags);
-    friend constexpr SkEnumBitMask<PredrawFlags> operator~(PredrawFlags);
+    SK_DECL_BITMASK_OPS_FRIENDS(PredrawFlags)
     // 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
@@ -2531,12 +2529,13 @@ private:
     std::unique_ptr<SkRasterHandleAllocator> fAllocator;
     SkSurface_Base*  fSurfaceBase;
-    SkSurface_Base* getSurfaceBase() const { return fSurfaceBase; }
+    virtual SkSurface_Base* getSurfaceBase() const { return fSurfaceBase; }
     void setSurfaceBase(SkSurface_Base* sb) {
         fSurfaceBase = sb;
     }
     friend class SkSurface_Base;
     friend class SkSurface_Ganesh;
+    friend class SkCaptureCanvas;
     SkIRect fClipRestrictionRect = SkIRect::MakeEmpty();
     int fClipRestrictionSaveCount = -1;
@@ -2559,6 +2558,7 @@ private:
     friend class SkRecords::Draw;
     template <typename Key>
     friend class skiatest::TestCanvas;
+    friend class AutoGlyphRunBuilder;
 protected:
     // For use by SkNoDrawCanvas (via SkCanvasVirtualEnforcer, which can't be a friend)
@@ -2704,7 +2704,15 @@ private:
     class AutoUpdateQRBounds;
     void validateClip() const;
-    std::unique_ptr<sktext::GlyphRunBuilder> fScratchGlyphRunBuilder;
+    sktext::GlyphRunBuilder* obtainGlyphRunBuilder();
+    void releaseGlyphRunBuilder();
+    /**
+     * fRunBuilders will be reused across text drawing commands
+     */
+    skia_private::STArray<1, std::unique_ptr<sktext::GlyphRunBuilder>> fRunBuilders;
+    int fRunBuildersUsed = 0;
 };
 /** \class SkAutoCanvasRestore

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

@@ -11,8 +11,8 @@
 #include "include/core/SkAlphaType.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkCPUTypes.h"
-#include "include/private/base/SkTPin.h"
+#include "include/private/SkCPUTypes.h"
+#include "include/private/SkTPin.h"
 #include <array>
 #include <cstdint>

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

@@ -11,7 +11,7 @@
 #include "include/core/SkColor.h"
 #include "include/core/SkFlattenable.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 #include <cstddef>
 #include <cstdint>

package/cpp/skia/include/core/SkColorSpace.h CHANGED Viewed

@@ -10,8 +10,8 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkFixed.h"
-#include "include/private/base/SkOnce.h"
+#include "include/private/SkFixed.h"
+#include "include/private/SkOnce.h"
 #include "modules/skcms/skcms.h"
 #include <cstddef>

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

@@ -10,7 +10,7 @@
 #include "include/core/SkBitmap.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 #include <cstdint>

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

@@ -14,7 +14,7 @@
 #include "include/core/SkScalar.h"
 #include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkTDArray.h"
+#include "include/private/SkTDArray.h"
 #include <cstddef>
 #include <memory>

package/cpp/skia/include/core/SkData.h CHANGED Viewed

@@ -10,7 +10,7 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSpan.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 #include <cstddef>
 #include <cstdint>

package/cpp/skia/include/core/SkDataTable.h CHANGED Viewed

@@ -9,8 +9,8 @@
 #define SkDataTable_DEFINED
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkAssert.h"
+#include "include/private/SkAPI.h"
+#include "include/private/SkAssert.h"
 #include <cstdint>
 #include <cstring>

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

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

package/cpp/skia/include/core/SkDrawable.h CHANGED Viewed

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

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

@@ -16,8 +16,8 @@
 #include "include/core/SkSpan.h"
 #include "include/core/SkTypeface.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkTo.h"
-#include "include/private/base/SkTypeTraits.h"
+#include "include/private/SkTo.h"
+#include "include/private/SkTypeTraits.h"
 #include <cstddef>
 #include <cstdint>

package/cpp/skia/include/core/SkFontMetrics.h CHANGED Viewed

@@ -9,7 +9,7 @@
 #define SkFontMetrics_DEFINED
 #include "include/core/SkScalar.h"
-#include "include/private/base/SkTo.h"
+#include "include/private/SkTo.h"
 /** \class SkFontMetrics
     The metrics of an SkFont.

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

@@ -86,7 +86,7 @@ public:
                                                 const char* bcp47[], int bcp47Count,
                                                 SkUnichar character) const;
-    struct Request {
+    struct SK_API Request {
         struct CMapEntry {
             SkUnichar character;
             SkUnichar variation;  // Zero for default variation.

package/cpp/skia/include/core/SkFontScanner.h CHANGED Viewed

@@ -12,9 +12,9 @@
 #include "include/core/SkFontParameters.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkFixed.h"
-#include "include/private/base/SkNoncopyable.h"
-#include "include/private/base/SkTArray.h"
+#include "include/private/SkFixed.h"
+#include "include/private/SkNoncopyable.h"
+#include "include/private/SkTArray.h"
 class SkFontStyle;
 class SkStreamAsset;
 class SkString;

package/cpp/skia/include/core/SkFontStyle.h CHANGED Viewed

@@ -9,7 +9,7 @@
 #define SkFontStyle_DEFINED
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkTPin.h"
+#include "include/private/SkTPin.h"
 #include <cstdint>

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

@@ -9,7 +9,7 @@
 #define SkGraphics_DEFINED
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 #include <cstddef>
 #include <cstdint>

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

@@ -13,7 +13,7 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSize.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 #include <cstddef>
 #include <cstdint>

package/cpp/skia/include/core/SkImageFilter.h CHANGED Viewed

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

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

@@ -13,7 +13,7 @@
 #include "include/core/SkPixmap.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkYUVAPixmaps.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 #include <cstddef>
 #include <cstdint>

package/cpp/skia/include/core/SkImageInfo.h CHANGED Viewed

@@ -13,10 +13,10 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSize.h"
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkDebug.h"
-#include "include/private/base/SkMath.h"
-#include "include/private/base/SkTFitsIn.h"
+#include "include/private/SkAPI.h"
+#include "include/private/SkDebug.h"
+#include "include/private/SkMath.h"
+#include "include/private/SkTFitsIn.h"
 #include <cstddef>
 #include <cstdint>

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

@@ -14,9 +14,9 @@
 #include "include/core/SkScalar.h"
 #include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkFloatingPoint.h"
-#include "include/private/base/SkMacros.h"
-#include "include/private/base/SkTo.h"
+#include "include/private/SkFloatingPoint.h"
+#include "include/private/SkMacros.h"
+#include "include/private/SkTo.h"
 #include <cstdint>
 #include <cstring>

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

@@ -14,8 +14,8 @@
 #include "include/core/SkSpan.h"
 #include "include/core/SkString.h"
 #include "include/effects/SkRuntimeEffect.h"
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkTArray.h"
+#include "include/private/SkAPI.h"
+#include "include/private/SkTArray.h"
 #include <cstddef>
 #include <cstdint>

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

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

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

@@ -14,7 +14,7 @@
 #include "include/core/SkPaint.h"
 #include "include/core/SkSamplingOptions.h"
 #include "include/core/SkScalar.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 #include "include/utils/SkNWayCanvas.h"
 #include <cstddef>

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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)
      */