@shopify/react-native-skia 2.6.2 → 2.6.3-next.2

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
-* Copyright 2024 Google Inc.
+* Copyright 2024 Google LLC
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google Inc.
+ * Copyright 2022 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -36,9 +36,9 @@ class SkString;
 #endif
 
 class SK_API SkPathBuilder {
-    using PointsArray = skia_private::STArray<4, SkPoint>;
-    using VerbsArray = skia_private::STArray<4, SkPathVerb>;
-    using ConicWeightsArray = skia_private::STArray<2, float>;
+    using PointsArray       = skia_private::STArray<32, SkPoint>;
+    using VerbsArray        = skia_private::STArray<32, SkPathVerb>;
+    using ConicWeightsArray = skia_private::STArray<16, float>;
 public:
     /** Constructs an empty SkPathBuilder. By default, SkPathBuilder has no verbs, no SkPoint, and
         no weights. FillType is set to kWinding.
@@ -987,7 +987,13 @@ public:
         return fConicWeights;
     }
 
-    SkPathBuilder& addRaw(const SkPathRaw&);
+    enum class Reserve {
+        // Reserves the exact amount of storage needed for pathraw (never overallocates).
+        kExact,
+        // Allows the storage buffers to overallocate, based on their internal growth policy.
+        kGrow
+    };
+    SkPathBuilder& addRaw(const SkPathRaw&, Reserve);
 
     SkPathIter iter() const;
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC.
+ * Copyright 2025 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC.
+ * Copyright 2019 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -11,6 +11,7 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSize.h"
 #include "include/private/SkIDChangeListener.h"
+#include "include/private/SkPixelStorage.h"
 #include "include/private/base/SkAPI.h"
 #include "include/private/base/SkTo.h"
 
@@ -25,11 +26,13 @@ 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 SkRefCnt {
+class SK_API SkPixelRef : public SkPixelStorage, public SkRefCnt {
 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/SkRecorder.h

@@ -10,6 +10,7 @@
 #include "include/private/base/SkAPI.h"
 
 class SkCanvas;
+class SkContentID;
 class SkSurface;
 
 namespace skcpu {
@@ -41,7 +42,7 @@ private:
     * Returns nullptr if capture is not enabled.
     */
     virtual SkCanvas* makeCaptureCanvas(SkCanvas*) = 0;
-    virtual void createCaptureBreakpoint(SkSurface*) = 0;
+    virtual SkContentID createCaptureBreakpoint(SkSurface*) = 0;
 
     friend class SkSurface_Base; // for capture functionality
 };

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

@@ -10,6 +10,7 @@
 
 #include "include/core/SkPath.h"
 #include "include/core/SkRect.h"
+#include "include/core/SkSpan.h"
 #include "include/private/base/SkAPI.h"
 #include "include/private/base/SkAssert.h"
 #include "include/private/base/SkDebug.h"
@@ -224,7 +225,12 @@ public:
 
         example: https://fiddle.skia.org/c/@Region_setRects
     */
-    bool setRects(const SkIRect rects[], int count);
+    bool setRects(SkSpan<const SkIRect> rects);
+#if !defined(SK_DISABLE_LEGACY_SKREGION_UNSPANNED_APIS)
+    bool setRects(const SkIRect rects[], int count) {
+        return this->setRects({rects, count});
+    }
+#endif
 
     /** Constructs a copy of an existing region.
         Makes two regions identical by value. Internally, region and
@@ -447,8 +453,9 @@ public:
 #endif
 
     /** \class SkRegion::Iterator
-        Returns sequence of rectangles, sorted along y-axis, then x-axis, that make
-        up SkRegion.
+        Goes through the region one rectangle at a time. For each "strip" of one or more contiguous
+        Y values (scanlines) in ascending order, the iterator returns each rectangle in that strip
+        (from left to right) before advancing to the next strip (which may or may not have a gap).
     */
     class SK_API Iterator {
     public:
@@ -494,9 +501,12 @@ public:
         bool done() const { return fDone; }
 
         /** Advances SkRegion::Iterator to next SkIRect in SkRegion if it is not done.
-
-        example: https://fiddle.skia.org/c/@Region_Iterator_next
-        */
+         * This moves to the next rectangle to the right within the current
+         * horizontal strip. If the end of the strip is reached, it automatically
+         * advances to the first rectangle in the next strip, skipping any vertical gaps.
+         *
+         * example: https://fiddle.skia.org/c/@Region_Iterator_next
+         */
         void next();
 
         /** Returns SkIRect element in SkRegion. Does not return predictable results if SkRegion
@@ -514,6 +524,7 @@ public:
 
     private:
         const SkRegion* fRgn;
+        // See top of SkRegion.cpp for more on the RLE encoding
         const SkRegion::RunType*  fRuns;
         SkIRect         fRect = {0, 0, 0, 0};
         bool            fDone;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
@@ -8,6 +8,7 @@
 #ifndef SkSerialProcs_DEFINED
 #define SkSerialProcs_DEFINED
 
+#include "include/core/SkFourByteTag.h"
 #include "include/core/SkRefCnt.h"
 #include "include/private/base/SkAPI.h"
 
@@ -86,6 +87,8 @@ using SkSlugProc = sk_sp<sktext::gpu::Slug> (*)(SkReadBuffer&, void* ctx);
 using SkDeserialTypefaceStreamProc = sk_sp<SkTypeface> (*)(SkStream&, void* ctx);
 using SkDeserialTypefaceProc = sk_sp<SkTypeface> (*)(const void* data, size_t length, void* ctx);
 
+using SkDeserialAllowTagsProc = bool(*)(SkFourByteTag, void* ctx);
+
 struct SK_API SkSerialProcs {
     SkSerialPictureProc fPictureProc = nullptr;
     void*               fPictureCtx = nullptr;
@@ -115,6 +118,10 @@ struct SK_API SkDeserialProcs {
     // parameters and returns a bool). Given that there are only two valid implementations of that
     // proc, we just insert the bool directly.
     bool                         fAllowSkSL = true;
+
+    // Can be used to restrict the tags that will be deserialized from SkPictures.
+    SkDeserialAllowTagsProc      fAllowTagsProc = nullptr;
+    void*                        fAllowTagsCtx = nullptr;
 };
 
 #endif

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

@@ -36,12 +36,10 @@ struct SkSamplingOptions;
 class SK_API SkShader : public SkFlattenable {
 public:
     /**
-     *  Returns true if the shader is guaranteed to produce only opaque
-     *  colors, subject to the SkPaint using the shader to apply an opaque
-     *  alpha value. Subclasses should override this to allow some
-     *  optimizations.
+     *  Returns true if the shader is guaranteed to produce only opaque colors, subject to the
+     *  SkPaint using the shader to apply an opaque alpha value.
      */
-    virtual bool isOpaque() const { return false; }
+    virtual bool isOpaque() const = 0;
 
     /**
      *  Iff this shader is backed by a single SkImage, return its ptr (the caller must ref this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -319,7 +319,7 @@ public:
     ~SkFILEStream() override;
 
     static std::unique_ptr<SkFILEStream> Make(const char path[]) {
-        std::unique_ptr<SkFILEStream> stream(new SkFILEStream(path));
+        auto stream = std::make_unique<SkFILEStream>(path);
         return stream->isValid() ? std::move(stream) : nullptr;
     }
 

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

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkStrikeRef_DEFINED
+#define SkStrikeRef_DEFINED
+
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkSpan.h"
+#include "include/core/SkTypes.h"
+
+class SkFont;
+class SkStrike;
+struct SkRect;
+
+/** \class SkStrikeRef
+    SkStrikeRef is a lightweight, thread-safe handle to a resolved font strike.
+    It caches the result of looking up an SkStrike for a particular SkFont configuration,
+    allowing repeated glyph metric queries (advances, bounds) without the overhead of
+    descriptor construction, hashing, and global cache lookup on each call.
+
+    Obtain an SkStrikeRef from SkFont::makeStrikeRef(). The returned object remains valid
+    as long as it is held; the underlying SkStrike is atomically reference counted.
+
+    SkStrikeRef does not track changes to the SkFont it was created from. If the SkFont's
+    properties change (size, typeface, hinting, etc.), a new SkStrikeRef must be obtained.
+*/
+class SK_API SkStrikeRef {
+public:
+    SkStrikeRef();
+    ~SkStrikeRef();
+
+    SkStrikeRef(const SkStrikeRef&);
+    SkStrikeRef& operator=(const SkStrikeRef&);
+    SkStrikeRef(SkStrikeRef&&);
+    SkStrikeRef& operator=(SkStrikeRef&&);
+
+    /** Returns true if this SkStrikeRef holds a valid strike. */
+    explicit operator bool() const { return fStrike != nullptr; }
+
+    /** Retrieves the advance widths for each glyph.
+        widths receives min(widths.size(), glyphs.size()) values.
+
+        @param glyphs  array of glyph indices to be measured
+        @param widths  returns text advances for each glyph, in font units
+    */
+    void getWidths(SkSpan<const SkGlyphID> glyphs, SkSpan<SkScalar> widths) const;
+
+    /** Retrieves the advance width for a single glyph.
+
+        @param glyph   glyph index to be measured
+        @return        advance width in font units
+    */
+    SkScalar getWidth(SkGlyphID glyph) const;
+
+    /** Retrieves the advance widths and bounds for each glyph.
+        widths receives min(widths.size(), glyphs.size()) values.
+        bounds receives min(bounds.size(), glyphs.size()) values.
+
+        @param glyphs  array of glyph indices to be measured
+        @param widths  returns text advances for each glyph
+        @param bounds  returns bounds for each glyph relative to (0, 0)
+    */
+    void getWidthsBounds(SkSpan<const SkGlyphID> glyphs,
+                         SkSpan<SkScalar> widths,
+                         SkSpan<SkRect> bounds) const;
+
+private:
+    friend class SkFont;
+    SkStrikeRef(sk_sp<SkStrike> strike, SkScalar strikeToSourceScale);
+
+    sk_sp<SkStrike> fStrike;
+    SkScalar fStrikeToSourceScale = 0;
+};
+
+#endif  // SkStrikeRef_DEFINED

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -126,12 +126,11 @@ public:
     DataType dataType() const { return fDataType; }
 
     /**
-     * Row bytes for the ith plane. Returns zero if i >= numPlanes() or this SkYUVAPixmapInfo is
-     * invalid.
+     * Row bytes for the ith plane. Returns zero if this SkYUVAPixmapInfo is invalid.
      */
     size_t rowBytes(int i) const { return fRowBytes[static_cast<size_t>(i)]; }
 
-    /** Image info for the ith plane, or default SkImageInfo if i >= numPlanes() */
+    /** Image info for the ith plane */
     const SkImageInfo& planeInfo(int i) const { return fPlaneInfos[static_cast<size_t>(i)]; }
 
     /**
@@ -234,8 +233,7 @@ public:
     const std::array<SkPixmap, kMaxPlanes>& planes() const { return fPlanes; }
 
     /**
-     * Get the ith SkPixmap plane. SkPixmap will be default initialized if i >= numPlanes or this
-     * SkYUVAPixmaps is invalid.
+     * Get the ith SkPixmap plane. SkPixmap will be default initialized if SkYUVAPixmaps is invalid.
      */
     const SkPixmap& plane(int i) const { return fPlanes[SkToSizeT(i)]; }
 

package/cpp/skia/include/docs/SkPDFDocument.h

@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC.
+// Copyright 2018 Google LLC
 // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 #ifndef SkPDFDocument_DEFINED
 #define SkPDFDocument_DEFINED

package/cpp/skia/include/docs/SkXPSDocument.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/effects/SkGradient.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC.
+ * Copyright 2025 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/effects/SkHighContrastFilter.h

@@ -1,5 +1,5 @@
 /*
-* Copyright 2017 Google Inc.
+* Copyright 2017 Google LLC
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.

package/cpp/skia/include/effects/SkRuntimeEffect.h

@@ -324,8 +324,8 @@ private:
     uint32_t fStableKey = 0;
     SkString fName;
 
-    std::unique_ptr<SkSL::Program> fBaseProgram;
-    std::unique_ptr<SkSL::RP::Program> fRPProgram;
+    std::unique_ptr<const SkSL::Program> fBaseProgram;
+    std::unique_ptr<const SkSL::RP::Program> fRPProgram;
     mutable SkOnce fCompileRPProgramOnce;
     const SkSL::FunctionDefinition& fMain;
     std::vector<Uniform> fUniforms;

package/cpp/skia/include/effects/SkShaderMaskFilter.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/effects/SkTrimPathEffect.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/encode/SkEncoder.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/encode/SkJpegEncoder.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/encode/SkPngEncoder.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/encode/SkPngRustEncoder.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC.
+ * Copyright 2024 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/encode/SkWebpEncoder.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/gpu/GpuTypes.h

@@ -9,6 +9,7 @@
 #define skgpu_GpuTypes_DEFINED
 
 #include "include/core/SkTypes.h"
+#include "include/private/base/SkMacros.h"
 
 /**
  * This file includes numerous public types that are used by all of our gpu backends.
@@ -84,6 +85,7 @@ enum class GpuStatsFlags : uint32_t {
     kElapsedTime = 0b01,
     kOcclusionPassSamples = 0b10,
 };
+SK_MAKE_BITFIELD_CLASS_OPS(GpuStatsFlags)
 
 struct GpuStats {
     uint64_t elapsedTime = 0;

package/cpp/skia/include/gpu/MutableTextureState.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC.
+ * Copyright 2022 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/gpu/ganesh/GrBackendSemaphore.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.