@shopify/react-native-skia 0.1.197 → 0.1.199

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm

@@ -8,7 +8,9 @@
 #import "SkColorSpace.h"
 #import "SkSurface.h"
 
+#import <include/gpu/GrBackendSurface.h>
 #import <include/gpu/GrDirectContext.h>
+#import <include/gpu/ganesh/SkSurfaceGanesh.h>
 
 #pragma clang diagnostic pop
 
@@ -122,7 +124,7 @@ bool RNSkMetalCanvasProvider::renderToCanvas(
     GrBackendRenderTarget backendRT(_layer.drawableSize.width,
                                     _layer.drawableSize.height, 1, fbInfo);
 
-    auto skSurface = SkSurface::MakeFromBackendRenderTarget(
+    auto skSurface = SkSurfaces::WrapBackendRenderTarget(
         renderContext->skContext.get(), backendRT, kTopLeft_GrSurfaceOrigin,
         kBGRA_8888_SkColorType, nullptr, nullptr);
 

package/ios/RNSkia-iOS/SkiaMetalRenderer.mm

@@ -5,7 +5,9 @@
 #import "SkColorSpace.h"
 #import "SkSurface.h"
 
+#import <include/gpu/GrBackendSurface.h>
 #import <include/gpu/GrDirectContext.h>
+#import <include/gpu/ganesh/SkSurfaceGanesh.h>
 
 #pragma clang diagnostic pop
 
@@ -44,7 +46,7 @@ sk_sp<SkSurface> MakeOffscreenMetalSurface(int width, int height) {
   GrBackendTexture backendTexture(width, height, GrMipMapped::kNo, info);
 
   // Create a SkSurface from the GrBackendTexture
-  auto surface = SkSurface::MakeFromBackendTexture(
+  auto surface = SkSurfaces::WrapBackendTexture(
       ctx->skiaContext.get(), backendTexture, kTopLeft_GrSurfaceOrigin, 0,
       kBGRA_8888_SkColorType, nullptr, nullptr,
       [](void *addr) { delete (OffscreenRenderContext *)addr; }, ctx);

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

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libsksg.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</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libsksg.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/libs/ios/libsvg.xcframework/Info.plist

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libsvg.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</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libsvg.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.197",
+  "version": "0.1.199",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "files": [
@@ -34,7 +34,6 @@
     "libs/ios/libskottie.xcframework",
     "libs/ios/libsksg.xcframework",
     "react-native-skia.podspec",
-    "scripts/install-npm.js",
     "scripts/setup-canvaskit.js",
     "dist/**"
   ],
@@ -43,8 +42,8 @@
     "lint": "eslint . --ext .ts,.tsx  --max-warnings 0 --cache",
     "test": "jest",
     "e2e": "E2E=true yarn test -i e2e",
-    "postinstall": "node scripts/install-npm.js",
-    "build": "bob build && merge-dirs lib/typescript/src lib/commonjs && merge-dirs lib/typescript/src lib/module"
+    "build": "bob build && merge-dirs lib/typescript/src lib/commonjs && merge-dirs lib/typescript/src lib/module",
+    "postinstall": "node scripts/install-npm.js"
   },
   "repository": {
     "type": "git",

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

@@ -1,29 +0,0 @@
-/*
-* Copyright 2015 Google Inc.
-*
-* Use of this source code is governed by a BSD-style license that can be
-* found in the LICENSE file.
-*/
-
-#ifndef SkTableColorFilter_DEFINED
-#define SkTableColorFilter_DEFINED
-
-#include "include/core/SkColorFilter.h"
-
-// (DEPRECATED) These factory functions are deprecated. Please use the ones in
-// SkColorFilters (i.e., Table and TableARGB).
-class SK_API SkTableColorFilter {
-public:
-    static sk_sp<SkColorFilter> Make(const uint8_t table[256]) {
-        return SkColorFilters::Table(table);
-    }
-
-    static sk_sp<SkColorFilter> MakeARGB(const uint8_t tableA[256],
-                                         const uint8_t tableR[256],
-                                         const uint8_t tableG[256],
-                                         const uint8_t tableB[256]) {
-        return SkColorFilters::TableARGB(tableA, tableR, tableG, tableB);
-    }
-};
-
-#endif

package/cpp/skia/include/private/SkOpts_spi.h

@@ -1,23 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkOpts_spi_DEFINED
-#define SkOpts_spi_DEFINED
-
-#include "include/private/base/SkAPI.h"
-
-#include <cstddef>
-
-// These are exposed as SK_SPI (e.g. SkParagraph), the rest of SkOpts is
-// declared in src/core
-
-namespace SkOpts {
-    // The fastest high quality 32-bit hash we can provide on this platform.
-    extern uint32_t SK_SPI (*hash_fn)(const void* data, size_t bytes, uint32_t seed);
-} // namespace SkOpts
-
-#endif

package/cpp/skia/include/private/SkSpinlock.h

@@ -1,57 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkSpinlock_DEFINED
-#define SkSpinlock_DEFINED
-
-#include "include/core/SkTypes.h"
-#include "include/private/base/SkThreadAnnotations.h"
-#include <atomic>
-
-class SK_CAPABILITY("mutex") SkSpinlock {
-public:
-    constexpr SkSpinlock() = default;
-
-    void acquire() SK_ACQUIRE() {
-        // To act as a mutex, we need an acquire barrier when we acquire the lock.
-        if (fLocked.exchange(true, std::memory_order_acquire)) {
-            // Lock was contended.  Fall back to an out-of-line spin loop.
-            this->contendedAcquire();
-        }
-    }
-
-    // Acquire the lock or fail (quickly). Lets the caller decide to do something other than wait.
-    bool tryAcquire() SK_TRY_ACQUIRE(true) {
-        // To act as a mutex, we need an acquire barrier when we acquire the lock.
-        if (fLocked.exchange(true, std::memory_order_acquire)) {
-            // Lock was contended. Let the caller decide what to do.
-            return false;
-        }
-        return true;
-    }
-
-    void release() SK_RELEASE_CAPABILITY() {
-        // To act as a mutex, we need a release barrier when we release the lock.
-        fLocked.store(false, std::memory_order_release);
-    }
-
-private:
-    SK_API void contendedAcquire();
-
-    std::atomic<bool> fLocked{false};
-};
-
-class SK_SCOPED_CAPABILITY SkAutoSpinlock {
-public:
-    SkAutoSpinlock(SkSpinlock& mutex) SK_ACQUIRE(mutex) : fSpinlock(mutex) { fSpinlock.acquire(); }
-    ~SkAutoSpinlock() SK_RELEASE_CAPABILITY() { fSpinlock.release(); }
-
-private:
-    SkSpinlock& fSpinlock;
-};
-
-#endif//SkSpinlock_DEFINED

package/cpp/skia/include/private/chromium/GrSlug.h

@@ -1,16 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrSlug_DEFINED
-#define GrSlug_DEFINED
-
-#include "include/private/chromium/Slug.h"
-
-// TODO: Update Chrome to use sktext::gpu classes and remove these
-using GrSlug = sktext::gpu::Slug;
-
-#endif  // GrSlug_DEFINED

package/scripts/install-npm.js

@@ -1,33 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-
-console.log("Updating symlinks for Android build...");
-
-const createSymlink = (p) => {
-  console.log(`Creating symlink to ${p}`, __dirname, process.cwd());
-  const srcDir = path.resolve(`./cpp/${p}`);
-  const dstDir = path.resolve(`./android/cpp/${p}`);
-
-  // 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");
-  }
-};
-
-// Copy common cpp files from the package root to the android folder
-createSymlink("api");
-createSymlink("jsi");
-createSymlink("rnskia");
-createSymlink("skia");
-createSymlink("utils");
-
-console.log("Symlinks created successfully.");