@shopify/react-native-skia 0.1.192 → 0.1.193

package/cpp/skia/modules/svg/include/SkSVGRenderContext.h

@@ -15,11 +15,11 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkSize.h"
 #include "include/core/SkTypes.h"
-#include "include/private/SkTHash.h"
 #include "modules/skresources/include/SkResources.h"
 #include "modules/svg/include/SkSVGAttribute.h"
 #include "modules/svg/include/SkSVGIDMapper.h"
-#include "src/core/SkTLazy.h"
+#include "src/base/SkTLazy.h"
+#include "src/core/SkTHash.h"
 
 class SkCanvas;
 class SkSVGLength;
@@ -52,7 +52,7 @@ struct SkSVGPresentationContext {
     SkSVGPresentationContext(const SkSVGPresentationContext&)            = default;
     SkSVGPresentationContext& operator=(const SkSVGPresentationContext&) = default;
 
-    const SkTHashMap<SkString, SkSVGColorType>* fNamedColors = nullptr;
+    const skia_private::THashMap<SkString, SkSVGColorType>* fNamedColors = nullptr;
 
     // Inherited presentation attributes, computed for the current node.
     SkSVGPresentationAttributes fInherited;

package/cpp/skia/modules/svg/include/SkSVGSVG.h

@@ -10,7 +10,7 @@
 
 #include "modules/svg/include/SkSVGContainer.h"
 #include "modules/svg/include/SkSVGTypes.h"
-#include "src/core/SkTLazy.h"
+#include "src/base/SkTLazy.h"
 
 class SkSVGLengthContext;
 

package/cpp/skia/modules/svg/include/SkSVGTypes.h

@@ -18,8 +18,9 @@
 #include "include/core/SkSpan.h"
 #include "include/core/SkString.h"
 #include "include/core/SkTypes.h"
-#include "include/private/SkTDArray.h"
-#include "src/core/SkTLazy.h"
+
+#include <optional>
+#include <vector>
 
 using SkSVGColorType     = SkColor;
 using SkSVGIntegerType   = int;
@@ -27,7 +28,7 @@ using SkSVGNumberType    = SkScalar;
 using SkSVGStringType    = SkString;
 using SkSVGViewBoxType   = SkRect;
 using SkSVGTransformType = SkMatrix;
-using SkSVGPointsType    = SkTDArray<SkPoint>;
+using SkSVGPointsType    = std::vector<SkPoint>;
 
 enum class SkSVGPropertyState {
     kUnspecified,
@@ -45,17 +46,17 @@ public:
     explicit SkSVGProperty(SkSVGPropertyState state) : fState(state) {}
 
     explicit SkSVGProperty(const T& value) : fState(SkSVGPropertyState::kValue) {
-        fValue.set(value);
+        fValue = value;
     }
 
     explicit SkSVGProperty(T&& value) : fState(SkSVGPropertyState::kValue) {
-        fValue.set(std::move(value));
+        fValue = std::move(value);
     }
 
     template <typename... Args>
     void init(Args&&... args) {
         fState = SkSVGPropertyState::kValue;
-        fValue.init(std::forward<Args>(args)...);
+        fValue.emplace(std::forward<Args>(args)...);
     }
 
     constexpr bool isInheritable() const { return kInheritable; }
@@ -63,7 +64,7 @@ public:
     bool isValue() const { return fState == SkSVGPropertyState::kValue; }
 
     T* getMaybeNull() const {
-        return fValue.getMaybeNull();
+        return fValue.has_value() ? &fValue.value() : nullptr;
     }
 
     void set(SkSVGPropertyState state) {
@@ -75,41 +76,41 @@ public:
 
     void set(const T& value) {
         fState = SkSVGPropertyState::kValue;
-        fValue.set(value);
+        fValue = value;
     }
 
     void set(T&& value) {
         fState = SkSVGPropertyState::kValue;
-        fValue.set(std::move(value));
+        fValue = std::move(value);
     }
 
     T* operator->() {
         SkASSERT(fState == SkSVGPropertyState::kValue);
-        SkASSERT(fValue.isValid());
-        return fValue.get();
+        SkASSERT(fValue.has_value());
+        return &fValue.value();
     }
 
     const T* operator->() const {
         SkASSERT(fState == SkSVGPropertyState::kValue);
-        SkASSERT(fValue.isValid());
-        return fValue.get();
+        SkASSERT(fValue.has_value());
+        return &fValue.value();
     }
 
     T& operator*() {
         SkASSERT(fState == SkSVGPropertyState::kValue);
-        SkASSERT(fValue.isValid());
+        SkASSERT(fValue.has_value());
         return *fValue;
     }
 
     const T& operator*() const {
         SkASSERT(fState == SkSVGPropertyState::kValue);
-        SkASSERT(fValue.isValid());
+        SkASSERT(fValue.has_value());
         return *fValue;
     }
 
 private:
     SkSVGPropertyState fState;
-    SkTLazy<T> fValue;
+    std::optional<T>   fValue;
 };
 
 class SkSVGLength {
@@ -180,7 +181,7 @@ public:
         kColor,
         kICCColor,
     };
-    using Vars = SkSTArray<1, SkString>;
+    using Vars = std::vector<SkString>;
 
     SkSVGColor() : SkSVGColor(SK_ColorBLACK) {}
     explicit SkSVGColor(const SkSVGColorType& c) : fType(Type::kColor), fColor(c), fVars(nullptr) {}
@@ -400,7 +401,7 @@ public:
 
     SkSVGDashArray()                : fType(Type::kNone) {}
     explicit SkSVGDashArray(Type t) : fType(t) {}
-    explicit SkSVGDashArray(SkTDArray<SkSVGLength>&& dashArray)
+    explicit SkSVGDashArray(std::vector<SkSVGLength>&& dashArray)
         : fType(Type::kDashArray)
         , fDashArray(std::move(dashArray)) {}
 
@@ -414,11 +415,11 @@ public:
 
     Type type() const { return fType; }
 
-    const SkTDArray<SkSVGLength>& dashArray() const { return fDashArray; }
+    const std::vector<SkSVGLength>& dashArray() const { return fDashArray; }
 
 private:
     Type fType;
-    SkTDArray<SkSVGLength> fDashArray;
+    std::vector<SkSVGLength> fDashArray;
 };
 
 class SkSVGStopColor {
@@ -673,7 +674,7 @@ enum class SkSVGFeColorMatrixType {
     kLuminanceToAlpha,
 };
 
-using SkSVGFeColorMatrixValues = SkTDArray<SkSVGNumberType>;
+using SkSVGFeColorMatrixValues = std::vector<SkSVGNumberType>;
 
 enum class SkSVGFeCompositeOperator {
     kOver,

package/cpp/skia/modules/svg/include/SkSVGValue.h

@@ -12,7 +12,7 @@
 #include "include/core/SkMatrix.h"
 #include "include/core/SkPath.h"
 #include "include/core/SkTypes.h"
-#include "include/private/SkNoncopyable.h"
+#include "include/private/base/SkNoncopyable.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
 class SkSVGValue : public SkNoncopyable {

package/cpp/skia/{include/private → src/core}/SkTHash.h

@@ -10,13 +10,15 @@
 
 #include "include/core/SkTypes.h"
 #include "include/private/SkChecksum.h"
-#include "include/private/SkTemplates.h"
+#include "include/private/base/SkTemplates.h"
 
 #include <initializer_list>
 #include <new>
 #include <utility>
 
-// Before trying to use SkTHashTable, look below to see if SkTHashMap or SkTHashSet works for you.
+namespace skia_private {
+
+// Before trying to use THashTable, look below to see if THashMap or THashSet works for you.
 // They're easier to use, usually perform the same, and have fewer sharp edges.
 
 // T and K are treated as ordinary copyable C++ types.
@@ -26,15 +28,15 @@
 // If the key is large and stored inside T, you may want to make K a const&.
 // Similarly, if T is large you might want it to be a pointer.
 template <typename T, typename K, typename Traits = T>
-class SkTHashTable {
+class THashTable {
 public:
-    SkTHashTable()  = default;
-    ~SkTHashTable() = default;
+    THashTable()  = default;
+    ~THashTable() = default;
 
-    SkTHashTable(const SkTHashTable&  that) { *this = that; }
-    SkTHashTable(      SkTHashTable&& that) { *this = std::move(that); }
+    THashTable(const THashTable&  that) { *this = that; }
+    THashTable(      THashTable&& that) { *this = std::move(that); }
 
-    SkTHashTable& operator=(const SkTHashTable& that) {
+    THashTable& operator=(const THashTable& that) {
         if (this != &that) {
             fCount     = that.fCount;
             fCapacity  = that.fCapacity;
@@ -46,7 +48,7 @@ public:
         return *this;
     }
 
-    SkTHashTable& operator=(SkTHashTable&& that) {
+    THashTable& operator=(THashTable&& that) {
         if (this != &that) {
             fCount    = that.fCount;
             fCapacity = that.fCapacity;
@@ -58,7 +60,7 @@ public:
     }
 
     // Clear the table.
-    void reset() { *this = SkTHashTable(); }
+    void reset() { *this = THashTable(); }
 
     // How many entries are in the table?
     int count() const { return fCount; }
@@ -75,7 +77,7 @@ public:
     // If you change an entry so that it no longer has the same key, all hell
     // will break loose.  Do not do that!
     //
-    // Please prefer to use SkTHashMap or SkTHashSet, which do not have this danger.
+    // Please prefer to use THashMap or THashSet, which do not have this danger.
 
     // The pointers returned by set() and find() are valid only until the next call to set().
     // The pointers you receive in foreach() are only valid for its duration.
@@ -103,7 +105,7 @@ public:
             }
             index = this->next(index);
         }
-        SkASSERT(fCapacity == 0);
+        SkASSERT(fCapacity == fCount);
         return nullptr;
     }
 
@@ -145,8 +147,8 @@ public:
 
         fCount = 0;
         fCapacity = capacity;
-        SkAutoTArray<Slot> oldSlots = std::move(fSlots);
-        fSlots = SkAutoTArray<Slot>(capacity);
+        AutoTArray<Slot> oldSlots = std::move(fSlots);
+        fSlots = AutoTArray<Slot>(capacity);
 
         for (int i = 0; i < oldCapacity; i++) {
             Slot& s = oldSlots[i];
@@ -178,12 +180,12 @@ public:
     }
 
     // A basic iterator-like class which disallows mutation; sufficient for range-based for loops.
-    // Intended for use by SkTHashMap and SkTHashSet via begin() and end().
+    // Intended for use by THashMap and THashSet via begin() and end().
     // Adding or removing elements may invalidate all iterators.
     template <typename SlotVal>
     class Iter {
     public:
-        using TTable = SkTHashTable<T, K, Traits>;
+        using TTable = THashTable<T, K, Traits>;
 
         Iter(const TTable* table, int slot) : fTable(table), fSlot(slot) {}
 
@@ -411,22 +413,22 @@ private:
 
     int fCount    = 0,
         fCapacity = 0;
-    SkAutoTArray<Slot> fSlots;
+    AutoTArray<Slot> fSlots;
 };
 
-// Maps K->V.  A more user-friendly wrapper around SkTHashTable, suitable for most use cases.
+// Maps K->V.  A more user-friendly wrapper around THashTable, suitable for most use cases.
 // K and V are treated as ordinary copyable C++ types, with no assumed relationship between the two.
 template <typename K, typename V, typename HashK = SkGoodHash>
-class SkTHashMap {
+class THashMap {
 public:
     // Allow default construction and assignment.
-    SkTHashMap() = default;
+    THashMap() = default;
 
-    SkTHashMap(SkTHashMap<K, V, HashK>&& that) = default;
-    SkTHashMap(const SkTHashMap<K, V, HashK>& that) = default;
+    THashMap(THashMap<K, V, HashK>&& that) = default;
+    THashMap(const THashMap<K, V, HashK>& that) = default;
 
-    SkTHashMap<K, V, HashK>& operator=(SkTHashMap<K, V, HashK>&& that) = default;
-    SkTHashMap<K, V, HashK>& operator=(const SkTHashMap<K, V, HashK>& that) = default;
+    THashMap<K, V, HashK>& operator=(THashMap<K, V, HashK>&& that) = default;
+    THashMap<K, V, HashK>& operator=(const THashMap<K, V, HashK>& that) = default;
 
     // Construct with an initializer list of key-value pairs.
     struct Pair : public std::pair<K, V> {
@@ -435,7 +437,7 @@ public:
         static auto Hash(const K& key) { return HashK()(key); }
     };
 
-    SkTHashMap(std::initializer_list<Pair> pairs) {
+    THashMap(std::initializer_list<Pair> pairs) {
         fTable.resize(pairs.size() * 5 / 3);
         for (const Pair& p : pairs) {
             fTable.set(p);
@@ -498,7 +500,7 @@ public:
     }
 
     // Dereferencing an iterator gives back a key-value pair, suitable for structured binding.
-    using Iter = typename SkTHashTable<Pair, K>::template Iter<std::pair<K, V>>;
+    using Iter = typename THashTable<Pair, K>::template Iter<std::pair<K, V>>;
 
     Iter begin() const {
         return Iter::MakeBegin(&fTable);
@@ -509,24 +511,24 @@ public:
     }
 
 private:
-    SkTHashTable<Pair, K> fTable;
+    THashTable<Pair, K> fTable;
 };
 
 // A set of T.  T is treated as an ordinary copyable C++ type.
 template <typename T, typename HashT = SkGoodHash>
-class SkTHashSet {
+class THashSet {
 public:
     // Allow default construction and assignment.
-    SkTHashSet() = default;
+    THashSet() = default;
 
-    SkTHashSet(SkTHashSet<T, HashT>&& that) = default;
-    SkTHashSet(const SkTHashSet<T, HashT>& that) = default;
+    THashSet(THashSet<T, HashT>&& that) = default;
+    THashSet(const THashSet<T, HashT>& that) = default;
 
-    SkTHashSet<T, HashT>& operator=(SkTHashSet<T, HashT>&& that) = default;
-    SkTHashSet<T, HashT>& operator=(const SkTHashSet<T, HashT>& that) = default;
+    THashSet<T, HashT>& operator=(THashSet<T, HashT>&& that) = default;
+    THashSet<T, HashT>& operator=(const THashSet<T, HashT>& that) = default;
 
     // Construct with an initializer list of Ts.
-    SkTHashSet(std::initializer_list<T> vals) {
+    THashSet(std::initializer_list<T> vals) {
         fTable.resize(vals.size() * 5 / 3);
         for (const T& val : vals) {
             fTable.set(val);
@@ -574,7 +576,7 @@ private:
     };
 
 public:
-    using Iter = typename SkTHashTable<T, T, Traits>::template Iter<T>;
+    using Iter = typename THashTable<T, T, Traits>::template Iter<T>;
 
     Iter begin() const {
         return Iter::MakeBegin(&fTable);
@@ -585,7 +587,9 @@ public:
     }
 
 private:
-    SkTHashTable<T, T, Traits> fTable;
+    THashTable<T, T, Traits> fTable;
 };
 
-#endif//SkTHash_DEFINED
+}  // namespace skia_private
+
+#endif  // SkTHash_DEFINED

package/ios/RNSkia-iOS/ViewScreenshotService.mm

@@ -85,7 +85,7 @@
                         kBGRA_8888_SkColorType, kPremul_SkAlphaType);
 
   // ... and then create the SkImage itself!
-  return SkImage::MakeRasterData(info, skData, bytesPerRow);
+  return SkImages::RasterFromData(info, skData, bytesPerRow);
 }
 
 @end

package/libs/ios/libskia.xcframework/Info.plist

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskia.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskia.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "0.1.192",
+  "version": "0.1.193",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "files": [

package/react-native-skia.podspec

@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
 
   s.requires_arc = true
   s.pod_target_xcconfig = {
-    'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) SK_GL=1 SK_METAL=1',
+    'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) SK_METAL=1 SK_GANESH=1',
     'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
     'DEFINES_MODULE' => 'YES',
     "HEADER_SEARCH_PATHS" => '"$(PODS_TARGET_SRCROOT)/cpp/"/**'

package/scripts/install-npm.js

@@ -8,7 +8,17 @@ const createSymlink = (p) => {
   const srcDir = path.resolve(`./cpp/${p}`);
   const dstDir = path.resolve(`./android/cpp/${p}`);
 
-  if (!fs.existsSync(dstDir) || !fs.lstatSync(dstDir).isSymbolicLink()) {
+  // Case in PNPM which might turn symlink into a directory:
+  // In that case, remove the directory before creating the symlink
+  if (fs.existsSync(dstDir)) {
+    const lstat = fs.lstatSync(dstDir);
+    const isSymbolicLink = lstat.isSymbolicLink();
+    if (lstat.isDirectory() && !isSymbolicLink) {
+      fs.rmSync(dstDir, { recursive: true });
+    }
+  }
+
+  if (!fs.existsSync(dstDir)) {
     fs.symlinkSync(srcDir, dstDir, "junction");
   }
 };

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

@@ -1,71 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkImageEncoder_DEFINED
-#define SkImageEncoder_DEFINED
-
-#include "include/core/SkEncodedImageFormat.h"
-#include "include/core/SkRefCnt.h"
-#include "include/core/SkTypes.h"
-
-class SkBitmap;
-class SkData;
-class SkPixmap;
-class SkWStream;
-
-/**
- * Encode SkPixmap in the given binary image format.
- *
- * @param  dst     results are written to this stream.
- * @param  src     source pixels.
- * @param  format  image format, not all formats are supported.
- * @param  quality range from 0-100, this is supported by jpeg and webp.
- *                 higher values correspond to improved visual quality, but less compression.
- *
- * @return false iff input is bad or format is unsupported.
- *
- * Will always return false if Skia is compiled without image
- * encoders.
- *
- * For SkEncodedImageFormat::kWEBP, if quality is 100, it will use lossless compression. Otherwise
- * it will use lossy.
- *
- * For examples of encoding an image to a file or to a block of memory,
- * see tools/ToolUtils.h.
- */
-SK_API bool SkEncodeImage(SkWStream* dst, const SkPixmap& src,
-                          SkEncodedImageFormat format, int quality);
-
-/**
- * The following helper function wraps SkEncodeImage().
- */
-SK_API bool SkEncodeImage(SkWStream* dst, const SkBitmap& src, SkEncodedImageFormat f, int q);
-
-/**
- * Encode SkPixmap in the given binary image format.
- *
- * @param  src     source pixels.
- * @param  format  image format, not all formats are supported.
- * @param  quality range from 0-100, this is supported by jpeg and webp.
- *                 higher values correspond to improved visual quality, but less compression.
- *
- * @return encoded data or nullptr if input is bad or format is unsupported.
- *
- * Will always return nullptr if Skia is compiled without image
- * encoders.
- *
- * For SkEncodedImageFormat::kWEBP, if quality is 100, it will use lossless compression. Otherwise
- * it will use lossy.
- */
-SK_API sk_sp<SkData> SkEncodePixmap(const SkPixmap& src, SkEncodedImageFormat format, int quality);
-
-/**
- *  Helper that extracts the pixmap from the bitmap, and then calls SkEncodePixmap()
- */
-SK_API sk_sp<SkData> SkEncodeBitmap(const SkBitmap& src, SkEncodedImageFormat format, int quality);
-
-#endif  // SkImageEncoder_DEFINED