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

package/cpp/api/recorder/Convertor.h

@@ -69,7 +69,51 @@ template <typename T> struct unwrap_optional<std::optional<T>> {
 template <typename T>
 T getPropertyValue(jsi::Runtime &runtime, const jsi::Value &value);
 
-// Base template for convertProperty
+template <typename T, typename Target>
+bool convertSelectorProperty(jsi::Runtime &runtime, const jsi::Value &prop,
+                             Target &target, Variables &variables) {
+  if (!prop.isObject()) {
+    return false;
+  }
+  auto wrapper = prop.asObject(runtime);
+  if (!wrapper.hasProperty(runtime, "__sv") ||
+      !wrapper.hasProperty(runtime, "__key")) {
+    return false;
+  }
+  auto svVal = wrapper.getProperty(runtime, "__sv");
+  auto keyVal = wrapper.getProperty(runtime, "__key");
+  if (!isSharedValue(runtime, svVal) || !keyVal.isString()) {
+    return false;
+  }
+  auto sharedValue = svVal.asObject(runtime);
+  auto key = keyVal.asString(runtime).utf8(runtime);
+  auto name =
+      sharedValue.getProperty(runtime, "name").asString(runtime).utf8(runtime);
+
+  auto conv = [target = &target, key](jsi::Runtime &runtime,
+                                      const jsi::Object &val) {
+    auto value = val.getProperty(runtime, "value");
+    if (!value.isObject()) {
+      return;
+    }
+    auto values = value.asObject(runtime);
+    if (!values.hasProperty(runtime, key.c_str())) {
+      return;
+    }
+
+    auto selected = values.getProperty(runtime, key.c_str());
+    if (selected.isUndefined() || selected.isNull() ||
+        (selected.isObject() && selected.asObject(runtime).isFunction(runtime))) {
+      return;
+    }
+    *target = getPropertyValue<T>(runtime, selected);
+  };
+
+  variables[name].push_back(conv);
+  conv(runtime, sharedValue);
+  return true;
+}
+
 template <typename T, typename Target>
 void convertPropertyImpl(jsi::Runtime &runtime, const jsi::Object &object,
                          const std::string &propertyName, Target &target,
@@ -78,13 +122,16 @@ void convertPropertyImpl(jsi::Runtime &runtime, const jsi::Object &object,
     return;
   }
 
-  auto property = object.getProperty(runtime, propertyName.c_str());
+  auto prop = object.getProperty(runtime, propertyName.c_str());
+
+  if (convertSelectorProperty<T>(runtime, prop, target, variables)) {
+    return;
+  }
 
-  if (isSharedValue(runtime, property)) {
-    auto sharedValue = property.asObject(runtime);
-    auto name = sharedValue.getProperty(runtime, "name")
-                    .asString(runtime)
-                    .utf8(runtime);
+  if (isSharedValue(runtime, prop)) {
+    auto sharedValue = prop.asObject(runtime);
+    auto name =
+        sharedValue.getProperty(runtime, "name").asString(runtime).utf8(runtime);
     auto conv = [target = &target](jsi::Runtime &runtime,
                                    const jsi::Object &val) {
       auto value = val.getProperty(runtime, "value");
@@ -92,9 +139,10 @@ void convertPropertyImpl(jsi::Runtime &runtime, const jsi::Object &object,
     };
     variables[name].push_back(conv);
     conv(runtime, sharedValue);
-  } else {
-    target = getPropertyValue<T>(runtime, property);
+    return;
   }
+
+  target = getPropertyValue<T>(runtime, prop);
 }
 
 // Main convertProperty template

package/cpp/api/third_party/SkottieUtils.cpp

@@ -10,7 +10,7 @@
 #include "include/core/SkData.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkSize.h"
-#include "include/private/base/SkAssert.h"
+#include "include/private/SkAssert.h"
 #include "modules/skottie/include/Skottie.h"
 #include "modules/skresources/include/SkResources.h"
 

package/cpp/skia/include/android/SkAndroidFrameworkUtils.h

@@ -39,8 +39,6 @@ public:
 
     static void SafetyNetLog(const char*);
 
-    static sk_sp<SkSurface> getSurfaceFromCanvas(SkCanvas* canvas);
-
     static int SaveBehind(SkCanvas* canvas, const SkRect* subset);
 
     // Operating within the canvas' clip stack, this resets the geometry of the clip to be wide

package/cpp/skia/include/android/vk/AndroidVulkanMemoryAllocator.h

@@ -9,7 +9,7 @@
 #define AndroidVulkanMemoryAllocator_DEFINED
 
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 namespace skgpu {
 struct VulkanBackendContext;

package/cpp/skia/include/codec/SkAndroidCodec.h

@@ -15,7 +15,7 @@
 #include "include/core/SkSize.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkEncodedInfo.h"
-#include "include/private/base/SkNoncopyable.h"
+#include "include/private/SkNoncopyable.h"
 #include "modules/skcms/skcms.h"
 
 // TODO(kjlubick, bungeman) Replace these includes with forward declares

package/cpp/skia/include/codec/SkAvifDecoder.h

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

package/cpp/skia/include/codec/SkBmpDecoder.h

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

package/cpp/skia/include/codec/SkBmpRustDecoder.h

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkBmpRustDecoder_DEFINED
+#define SkBmpRustDecoder_DEFINED
+
+#include "include/codec/SkCodec.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/SkAPI.h"
+
+class SkData;
+class SkStream;
+
+#include <memory>
+
+namespace SkBmpRustDecoder {
+
+/** Returns true if this data claims to be a BMP image. */
+SK_API bool IsBmp(const void*, size_t);
+
+/**
+ *  Attempts to decode the given bytes as a BMP using Rust implementation.
+ *
+ *  If the bytes are not a BMP, returns nullptr.
+ */
+SK_API std::unique_ptr<SkCodec> Decode(std::unique_ptr<SkStream>,
+                                       SkCodec::Result*,
+                                       SkCodecs::DecodeContext = nullptr);
+SK_API std::unique_ptr<SkCodec> Decode(sk_sp<const SkData>,
+                                       SkCodec::Result*,
+                                       SkCodecs::DecodeContext = nullptr);
+
+inline constexpr SkCodecs::Decoder Decoder() {
+    return { "rust_bmp", IsBmp, Decode };
+}
+
+}  // namespace SkBmpRustDecoder
+
+#endif  // SkBmpRustDecoder_DEFINED

package/cpp/skia/include/codec/SkCodec.h

@@ -19,7 +19,7 @@
 #include "include/core/SkYUVAPixmaps.h"
 #include "include/private/SkEncodedInfo.h"
 #include "include/private/SkHdrMetadata.h"
-#include "include/private/base/SkNoncopyable.h"
+#include "include/private/SkNoncopyable.h"
 #include "modules/skcms/skcms.h"
 
 #include <cstddef>
@@ -1129,7 +1129,8 @@ private:
     friend class PNGCodecGM;    // for fillIncompleteImage
     friend class SkSampledCodec;
     friend class SkIcoCodec;
-    friend class SkPngCodec;     // for onGetGainmapCodec
+    friend class SkIcoRustCodec;  // for getEncodedInfo and getSampler
+    friend class SkPngCodecBase;  // for onGetGainmapCodec
     friend class SkAndroidCodec;  // for handleFrameIndex
     friend class SkCodecPriv;     // for fEncodedInfo
 };

package/cpp/skia/include/codec/SkGifDecoder.h

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

package/cpp/skia/include/codec/SkIcoDecoder.h

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

package/cpp/skia/include/codec/SkJpegDecoder.h

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

package/cpp/skia/include/codec/SkJpegxlDecoder.h

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

package/cpp/skia/include/codec/SkPixmapUtils.h

@@ -10,7 +10,7 @@
 
 #include "include/codec/SkEncodedOrigin.h"
 #include "include/core/SkImageInfo.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkPixmap;
 

package/cpp/skia/include/codec/SkPngDecoder.h

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

package/cpp/skia/include/codec/SkPngRustDecoder.h

@@ -10,7 +10,7 @@
 #include <memory>
 
 #include "include/codec/SkCodec.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkStream;
 

package/cpp/skia/include/codec/SkRawDecoder.h

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

package/cpp/skia/include/codec/SkWbmpDecoder.h

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

package/cpp/skia/include/codec/SkWebpDecoder.h

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -18,8 +18,8 @@
 #include "include/core/SkSamplingOptions.h"
 #include "include/core/SkSize.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkCPUTypes.h"
-#include "include/private/base/SkDebug.h"
+#include "include/private/SkCPUTypes.h"
+#include "include/private/SkDebug.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -205,7 +205,7 @@ public:
 
         @return  true if dimensions do not enclose area
     */
-    bool empty() const { return fPixmap.info().isEmpty(); }
+    bool empty() const { return fPixmap.isEmpty(); }
 
     /** Returns true if SkPixelRef is nullptr.
 

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

@@ -7,7 +7,7 @@
 #ifndef skcpu_Context_DEFINED
 #define skcpu_Context_DEFINED
 
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 #include <memory>
 

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

@@ -11,10 +11,9 @@
 #include <cstdint>
 #include "include/core/SkRecorder.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkCanvas;
-class SkContentID;
 class SkSurface;
 class SkSurfaceProps;
 struct SkImageInfo;
@@ -59,7 +58,7 @@ public:
 private:
     // TODO (b/412351769): Implement this so we can capture from a CPU Recorder.
     SkCanvas* makeCaptureCanvas(SkCanvas*) final { return nullptr; }
-    SkContentID createCaptureBreakpoint(SkSurface*) final;
+    void createCaptureBreakpoint(SkSurface*) final;
 };
 
 inline Recorder* AsRecorder(SkRecorder* recorder) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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