@shopify/react-native-skia 2.6.0 → 2.6.1

package/android/CMakeLists.txt

@@ -214,7 +214,6 @@ set_property(TARGET pathops PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libpat
 add_library(jsonreader STATIC IMPORTED)
 set_property(TARGET jsonreader PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libjsonreader.a")
 
-# Dawn library for Graphite builds (contains dawn::native symbols)
 if(SK_GRAPHITE)
     add_library(dawn_combined STATIC IMPORTED)
     set_property(TARGET dawn_combined PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libdawn_combined.a")

package/android/cpp/jni/JniWebGPUView.cpp

@@ -1,10 +1,10 @@
-#include <jni.h>
 #include <android/native_window_jni.h>
+#include <jni.h>
 
 #ifdef SK_GRAPHITE
-#include "webgpu/webgpu_cpp.h"
-#include "rnwgpu/SurfaceRegistry.h"
 #include "rnskia/RNDawnContext.h"
+#include "rnwgpu/SurfaceRegistry.h"
+#include "webgpu/webgpu_cpp.h"
 #endif
 
 extern "C" JNIEXPORT void JNICALL

package/android/cpp/rnskia-android/OpenGLContext.h

@@ -59,7 +59,7 @@ public:
   }
 
   sk_sp<SkSurface> MakeOffscreen(int width, int height,
-                                  bool useP3ColorSpace = false) {
+                                 bool useP3ColorSpace = false) {
     auto colorType = kRGBA_8888_SkColorType;
 
     SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
@@ -91,10 +91,9 @@ public:
                                          .texture = texture};
 
     sk_sp<SkColorSpace> colorSpace =
-        useP3ColorSpace
-            ? SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB,
-                                    SkNamedGamut::kDisplayP3)
-            : nullptr;
+        useP3ColorSpace ? SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB,
+                                                SkNamedGamut::kDisplayP3)
+                        : nullptr;
 
     // Create a SkSurface from the GrBackendTexture
     return SkSurfaces::WrapBackendTexture(

package/android/cpp/rnskia-android/RNSkAndroidPlatformContext.h

@@ -51,7 +51,7 @@ public:
   }
 
   sk_sp<SkSurface> makeOffscreenSurface(int width, int height,
-                                         bool useP3ColorSpace = false) override {
+                                        bool useP3ColorSpace = false) override {
 #if defined(SK_GRAPHITE)
     return DawnContext::getInstance().MakeOffscreen(width, height,
                                                     useP3ColorSpace);

package/apple/MetalContext.h

@@ -5,6 +5,7 @@
 
 #include "include/core/SkSurface.h"
 
+#include "include/core/SkColorSpace.h"
 #import <include/gpu/ganesh/GrBackendSurface.h>
 #import <include/gpu/ganesh/GrDirectContext.h>
 #import <include/gpu/ganesh/SkImageGanesh.h>
@@ -13,7 +14,6 @@
 #import <include/gpu/ganesh/mtl/GrMtlBackendSurface.h>
 #import <include/gpu/ganesh/mtl/GrMtlDirectContext.h>
 #import <include/gpu/ganesh/mtl/SkSurfaceMetal.h>
-#include "include/core/SkColorSpace.h"
 
 struct OffscreenRenderContext {
   id<MTLTexture> texture;
@@ -46,7 +46,7 @@ public:
   }
 
   sk_sp<SkSurface> MakeOffscreen(int width, int height,
-                                  bool useP3ColorSpace = false) {
+                                 bool useP3ColorSpace = false) {
     auto device = _device;
     auto ctx = new OffscreenRenderContext(device, _directContext, _commandQueue,
                                           width, height);
@@ -58,10 +58,9 @@ public:
         GrBackendTextures::MakeMtl(width, height, skgpu::Mipmapped::kNo, info);
 
     sk_sp<SkColorSpace> colorSpace =
-        useP3ColorSpace
-            ? SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB,
-                                    SkNamedGamut::kDisplayP3)
-            : nullptr;
+        useP3ColorSpace ? SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB,
+                                                SkNamedGamut::kDisplayP3)
+                        : nullptr;
 
     // Create a SkSurface from the GrBackendTexture
     auto surface = SkSurfaces::WrapBackendTexture(

package/apple/MetalWindowContext.mm

@@ -72,10 +72,9 @@ sk_sp<SkSurface> MetalWindowContext::getSurface() {
       _layer.drawableSize.width, _layer.drawableSize.height, fbInfo);
 
   sk_sp<SkColorSpace> skColorSpace =
-      _useP3ColorSpace
-          ? SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB,
-                                  SkNamedGamut::kDisplayP3)
-          : nullptr;
+      _useP3ColorSpace ? SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB,
+                                               SkNamedGamut::kDisplayP3)
+                       : nullptr;
   _skSurface = SkSurfaces::WrapBackendRenderTarget(
       _directContext, backendRT, kTopLeft_GrSurfaceOrigin,
       kBGRA_8888_SkColorType, skColorSpace, nullptr);

package/apple/RNSkApplePlatformContext.h

@@ -70,7 +70,7 @@ public:
 
   void raiseError(const std::exception &err) override;
   sk_sp<SkSurface> makeOffscreenSurface(int width, int height,
-                                         bool useP3ColorSpace = false) override;
+                                        bool useP3ColorSpace = false) override;
 
   sk_sp<SkFontMgr> createFontMgr() override;
 

package/apple/RNSkApplePlatformContext.mm

@@ -251,11 +251,12 @@ void RNSkApplePlatformContext::raiseError(const std::exception &err) {
   RCTFatal(RCTErrorWithMessage([NSString stringWithUTF8String:err.what()]));
 }
 
-sk_sp<SkSurface> RNSkApplePlatformContext::makeOffscreenSurface(
-    int width, int height, bool useP3ColorSpace) {
+sk_sp<SkSurface>
+RNSkApplePlatformContext::makeOffscreenSurface(int width, int height,
+                                               bool useP3ColorSpace) {
 #if defined(SK_GRAPHITE)
   return DawnContext::getInstance().MakeOffscreen(width, height,
-                                                   useP3ColorSpace);
+                                                  useP3ColorSpace);
 #else
   return MetalContext::getInstance().MakeOffscreen(width, height,
                                                    useP3ColorSpace);

package/apple/SkiaCVPixelBufferUtils.h

@@ -9,8 +9,8 @@
 
 #import <vector>
 
-#import <CoreVideo/CVPixelBuffer.h>
 #import <CoreVideo/CVMetalTextureCache.h>
+#import <CoreVideo/CVPixelBuffer.h>
 #import <MetalKit/MetalKit.h>
 
 #pragma clang diagnostic push

package/apple/SkiaCVPixelBufferUtils.mm

@@ -31,16 +31,12 @@
 #include <cmath>
 #if TARGET_RT_BIG_ENDIAN
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]) {                                                             \
-    *((char *)&fourcc), *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 2),    \
-        *(((char *)&fourcc) + 3), 0                                            \
-  }
+  (const char[]){*((char *)&fourcc), *(((char *)&fourcc) + 1),                 \
+                 *(((char *)&fourcc) + 2), *(((char *)&fourcc) + 3), 0}
 #else
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]) {                                                             \
-    *(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),                        \
-        *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0                  \
-  }
+  (const char[]){*(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),           \
+                 *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0}
 #endif
 
 // pragma MARK: TextureHolder
@@ -270,19 +266,20 @@ SkiaCVPixelBufferUtils::YUV::getSubsampling(OSType pixelFormat) {
 
 // pragma MARK: YUV getColorspace()
 
-SkYUVColorSpace SkiaCVPixelBufferUtils::YUV::getColorspace(
-    CVPixelBufferRef pixelBuffer) {
+SkYUVColorSpace
+SkiaCVPixelBufferUtils::YUV::getColorspace(CVPixelBufferRef pixelBuffer) {
   const OSType pixelFormat = CVPixelBufferGetPixelFormatType(pixelBuffer);
 
-  CFTypeRef matrixAttachment =
-      CVBufferCopyAttachment(pixelBuffer, kCVImageBufferYCbCrMatrixKey, nullptr);
+  CFTypeRef matrixAttachment = CVBufferCopyAttachment(
+      pixelBuffer, kCVImageBufferYCbCrMatrixKey, nullptr);
   CFStringRef matrix = nullptr;
   if (matrixAttachment != nullptr &&
       CFGetTypeID(matrixAttachment) == CFStringGetTypeID()) {
     matrix = reinterpret_cast<CFStringRef>(matrixAttachment);
   }
 
-  SkYUVColorSpace colorspace = getSkYUVColorSpaceFromMatrix(matrix, pixelFormat);
+  SkYUVColorSpace colorspace =
+      getSkYUVColorSpaceFromMatrix(matrix, pixelFormat);
   if (matrixAttachment != nullptr) {
     CFRelease(matrixAttachment);
   }
@@ -320,8 +317,9 @@ bool SkiaCVPixelBufferUtils::YUV::isTenBitYUVFormat(OSType pixelFormat) {
   }
 }
 
-SkYUVColorSpace SkiaCVPixelBufferUtils::YUV::getSkYUVColorSpaceFromMatrix(
-    CFStringRef matrix, OSType pixelFormat) {
+SkYUVColorSpace
+SkiaCVPixelBufferUtils::YUV::getSkYUVColorSpaceFromMatrix(CFStringRef matrix,
+                                                          OSType pixelFormat) {
   const bool isFullRange = isFullRangeYUVFormat(pixelFormat);
   const bool isTenBit = isTenBitYUVFormat(pixelFormat);
 
@@ -381,10 +379,11 @@ TextureHolder *SkiaCVPixelBufferUtils::getSkiaTextureForCVPixelBufferPlane(
         "Requested out-of-bounds plane index " + std::to_string(planeIndex) +
         " for pixel buffer with " + std::to_string(planesCount) + " planes.");
   }
-  size_t width = planesCount > 0 ? CVPixelBufferGetWidthOfPlane(pixelBuffer, planeIndex)
-                                 : CVPixelBufferGetWidth(pixelBuffer);
-  size_t height =
-      planesCount > 0 ? CVPixelBufferGetHeightOfPlane(pixelBuffer, planeIndex)
+  size_t width = planesCount > 0
+                     ? CVPixelBufferGetWidthOfPlane(pixelBuffer, planeIndex)
+                     : CVPixelBufferGetWidth(pixelBuffer);
+  size_t height = planesCount > 0
+                      ? CVPixelBufferGetHeightOfPlane(pixelBuffer, planeIndex)
                       : CVPixelBufferGetHeight(pixelBuffer);
   MTLPixelFormat pixelFormat =
       getMTLPixelFormatForCVPixelBufferPlane(pixelBuffer, planeIndex);
@@ -424,12 +423,12 @@ SkiaCVPixelBufferUtils::getTextureCache(id<MTLDevice> device) {
 MTLPixelFormat SkiaCVPixelBufferUtils::getMTLPixelFormatForCVPixelBufferPlane(
     CVPixelBufferRef pixelBuffer, size_t planeIndex) {
   const OSType format = CVPixelBufferGetPixelFormatType(pixelBuffer);
-  auto throwInvalidPlaneIndexForFormat = [&](size_t expectedPlanes)
-      -> MTLPixelFormat {
+  auto throwInvalidPlaneIndexForFormat =
+      [&](size_t expectedPlanes) -> MTLPixelFormat {
     throw std::runtime_error(
         "Invalid plane index " + std::to_string(planeIndex) +
-        " for pixel format " + std::string(FourCC2Str(format)) + " (expected 0.." +
-        std::to_string(expectedPlanes - 1) + ").");
+        " for pixel format " + std::string(FourCC2Str(format)) +
+        " (expected 0.." + std::to_string(expectedPlanes - 1) + ").");
   };
 
   switch (format) {
@@ -495,17 +494,18 @@ MTLPixelFormat SkiaCVPixelBufferUtils::getMTLPixelFormatForCVPixelBufferPlane(
       planesCount > 0 ? CVPixelBufferGetWidthOfPlane(pixelBuffer, planeIndex)
                       : CVPixelBufferGetWidth(pixelBuffer);
   const size_t bytesPerRow =
-      planesCount > 0 ? CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, planeIndex)
-                      : CVPixelBufferGetBytesPerRow(pixelBuffer);
+      planesCount > 0
+          ? CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, planeIndex)
+          : CVPixelBufferGetBytesPerRow(pixelBuffer);
   if (width == 0) [[unlikely]] {
     throw std::runtime_error("Invalid plane width for pixel format " +
                              std::string(FourCC2Str(format)) + "!");
   }
   if (bytesPerRow % width != 0) [[unlikely]] {
-    throw std::runtime_error(
-        "Invalid bytes per row! Bytes per row must be evenly divisible by width "
-        "for pixel format " +
-        std::string(FourCC2Str(format)) + "!");
+    throw std::runtime_error("Invalid bytes per row! Bytes per row must be "
+                             "evenly divisible by width "
+                             "for pixel format " +
+                             std::string(FourCC2Str(format)) + "!");
   }
   const size_t bytesPerPixel = bytesPerRow / width;
   if (bytesPerPixel == 1) {
@@ -519,6 +519,7 @@ MTLPixelFormat SkiaCVPixelBufferUtils::getMTLPixelFormatForCVPixelBufferPlane(
   }
 
   [[unlikely]] throw std::runtime_error(
-      "Invalid bytes per row! Expected 1 (R), 2 (RG) or 4 (RGBA), but received " +
+      "Invalid bytes per row! Expected 1 (R), 2 (RG) or 4 (RGBA), but "
+      "received " +
       std::to_string(bytesPerPixel));
 }

package/apple/SkiaPlatformContext.mm

@@ -7,8 +7,8 @@
 namespace rnwgpu {
 
 wgpu::Surface SkiaPlatformContext::makeSurface(wgpu::Instance instance,
-                                                void *surface, int width,
-                                                int height) {
+                                               void *surface, int width,
+                                               int height) {
   wgpu::SurfaceSourceMetalLayer metalSurfaceDesc;
   metalSurfaceDesc.layer = surface;
   wgpu::SurfaceDescriptor surfaceDescriptor;

package/apple/SkiaUIView.mm

@@ -1,5 +1,5 @@
-#import <React/RCTBridge.h>
 #import <QuartzCore/CATransaction.h>
+#import <React/RCTBridge.h>
 
 #import "RNSkiaModule.h"
 #import "SkiaUIView.h"

package/apple/SkiaWebGPUView.mm

@@ -7,8 +7,8 @@
 #import <react/renderer/components/rnskia/Props.h>
 #import <react/renderer/components/rnskia/RCTComponentViewHelpers.h>
 
-#import "WebGPUMetalView.h"
 #import "RCTFabricComponentsPlugins.h"
+#import "WebGPUMetalView.h"
 
 using namespace facebook::react;
 
@@ -16,14 +16,16 @@ using namespace facebook::react;
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const SkiaWebGPUViewProps>();
+    static const auto defaultProps =
+        std::make_shared<const SkiaWebGPUViewProps>();
     _props = defaultProps;
   }
   return self;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
-  return concreteComponentDescriptorProvider<SkiaWebGPUViewComponentDescriptor>();
+  return concreteComponentDescriptorProvider<
+      SkiaWebGPUViewComponentDescriptor>();
 }
 
 - (void)prepareForRecycle {
@@ -72,6 +74,8 @@ using namespace facebook::react;
 
 @end
 
-Class<RCTComponentViewProtocol> SkiaWebGPUViewCls(void) { return SkiaWebGPUView.class; }
+Class<RCTComponentViewProtocol> SkiaWebGPUViewCls(void) {
+  return SkiaWebGPUView.class;
+}
 
 #endif // RCT_NEW_ARCH_ENABLED

package/apple/WebGPUMetalView.h

@@ -4,7 +4,7 @@
 
 @interface WebGPUMetalView : RNSkPlatformView
 
-@property (nonatomic, strong) NSNumber *contextId;
+@property(nonatomic, strong) NSNumber *contextId;
 
 - (void)configure;
 - (void)update;

package/apple/WebGPUMetalView.mm

@@ -5,8 +5,8 @@
 #import "webgpu/webgpu_cpp.h"
 #import <QuartzCore/CAMetalLayer.h>
 
-#import "rnwgpu/SurfaceRegistry.h"
 #import "rnskia/RNDawnContext.h"
+#import "rnwgpu/SurfaceRegistry.h"
 
 @implementation WebGPUMetalView {
   BOOL _isConfigured;

package/cpp/api/JsiSkColor.h

@@ -103,10 +103,14 @@ public:
                                "Expected array of length 4 for color, got " +
                                    std::to_string(arr.size(runtime)));
           }
-          auto r = static_cast<float>(arr.getValueAtIndex(runtime, 0).asNumber());
-          auto g = static_cast<float>(arr.getValueAtIndex(runtime, 1).asNumber());
-          auto b = static_cast<float>(arr.getValueAtIndex(runtime, 2).asNumber());
-          auto a = static_cast<float>(arr.getValueAtIndex(runtime, 3).asNumber());
+          auto r =
+              static_cast<float>(arr.getValueAtIndex(runtime, 0).asNumber());
+          auto g =
+              static_cast<float>(arr.getValueAtIndex(runtime, 1).asNumber());
+          auto b =
+              static_cast<float>(arr.getValueAtIndex(runtime, 2).asNumber());
+          auto a =
+              static_cast<float>(arr.getValueAtIndex(runtime, 3).asNumber());
 
           // Create Float32Array and populate
           auto result = runtime.global()

package/cpp/api/JsiSkContourMeasure.h

@@ -58,12 +58,13 @@ public:
     auto start = arguments[0].asNumber();
     auto end = arguments[1].asNumber();
     auto startWithMoveTo = arguments[2].getBool();
-    SkPath path;
-    auto result = getObject()->getSegment(start, end, &path, startWithMoveTo);
+    SkPathBuilder builder;
+    auto result =
+        getObject()->getSegment(start, end, &builder, startWithMoveTo);
     if (!result) {
       throw jsi::JSError(runtime, "getSegment() failed");
     }
-    return JsiSkPath::toValue(runtime, getContext(), std::move(path));
+    return JsiSkPath::toValue(runtime, getContext(), builder.snapshot());
   }
 
   size_t getMemoryPressure() const override { return 1024; }

package/cpp/api/JsiSkImage.h

@@ -46,30 +46,35 @@
 // recognise the canonical Apple profile, not Skia's mathematically equivalent
 // but non-standard one. Pixel values are untouched — zero quality loss.
 static sk_sp<SkData> replaceJpegICCWithAppleP3(sk_sp<SkData> jpegData) {
-  if (!jpegData || jpegData->size() < 4) return jpegData;
+  if (!jpegData || jpegData->size() < 4)
+    return jpegData;
 
   const uint8_t *src = jpegData->bytes();
   size_t srcLen = jpegData->size();
-  if (src[0] != 0xFF || src[1] != 0xD8) return jpegData; // not a JPEG
+  if (src[0] != 0xFF || src[1] != 0xD8)
+    return jpegData; // not a JPEG
 
   CGColorSpaceRef p3 = CGColorSpaceCreateWithName(kCGColorSpaceDisplayP3);
-  if (!p3) return jpegData;
+  if (!p3)
+    return jpegData;
   CFDataRef cfICC = CGColorSpaceCopyICCData(p3);
   CGColorSpaceRelease(p3);
-  if (!cfICC) return jpegData;
+  if (!cfICC)
+    return jpegData;
 
   const uint8_t *iccBytes = CFDataGetBytePtr(cfICC);
   size_t iccLen = (size_t)CFDataGetLength(cfICC);
 
   // "ICC_PROFILE\0" APP2 marker signature (12 bytes)
   static const uint8_t iccSig[] = {0x49, 0x43, 0x43, 0x5F, 0x50, 0x52,
-                                    0x4F, 0x46, 0x49, 0x4C, 0x45, 0x00};
+                                   0x4F, 0x46, 0x49, 0x4C, 0x45, 0x00};
 
   SkDynamicMemoryWStream out;
 
   out.write(src, 2); // SOI
 
-  // Structure: marker(2) + length(2) + "ICC_PROFILE\0"(12) + chunk[1,1](2) + profile
+  // Structure: marker(2) + length(2) + "ICC_PROFILE\0"(12) + chunk[1,1](2) +
+  // profile
   size_t iccContentLen = sizeof(iccSig) + 2 + iccLen;
   size_t segLen = iccContentLen + 2; // length field includes itself
   uint8_t app2hdr[4] = {0xFF, 0xE2, (uint8_t)(segLen >> 8),
@@ -83,12 +88,15 @@ static sk_sp<SkData> replaceJpegICCWithAppleP3(sk_sp<SkData> jpegData) {
   // Copy all header segments except any existing ICC APP2
   size_t i = 2;
   while (i + 3 < srcLen) {
-    if (src[i] != 0xFF) break;
+    if (src[i] != 0xFF)
+      break;
     uint8_t marker = src[i + 1];
-    if (marker == 0xDA || marker == 0xD9) break; // SOS / EOI
+    if (marker == 0xDA || marker == 0xD9)
+      break; // SOS / EOI
     size_t segLenVal = (size_t(src[i + 2]) << 8) | src[i + 3];
     size_t end = i + 2 + segLenVal;
-    if (end > srcLen) break;
+    if (end > srcLen)
+      break;
     bool isICC = marker == 0xE2 && end > i + 4 + sizeof(iccSig) &&
                  memcmp(src + i + 4, iccSig, sizeof(iccSig)) == 0;
     if (!isICC) {

package/cpp/api/JsiSkParagraphBuilder.h

@@ -19,6 +19,12 @@
 
 #include "modules/skparagraph/include/ParagraphBuilder.h"
 
+#ifdef __APPLE__
+#include "modules/skunicode/include/SkUnicode_libgrapheme.h"
+#else
+#include "modules/skunicode/include/SkUnicode_icu.h"
+#endif
+
 #pragma clang diagnostic pop
 
 namespace RNSkia {
@@ -125,7 +131,14 @@ public:
       _fontCollection->setAssetFontManager(fontManager);
     }
     _fontCollection->enableFontFallback();
-    _builder = para::ParagraphBuilder::make(paragraphStyle, _fontCollection);
+    sk_sp<SkUnicode> unicode;
+#ifdef __APPLE__
+    unicode = SkUnicodes::Libgrapheme::Make();
+#else
+    unicode = SkUnicodes::ICU::Make();
+#endif
+    _builder =
+        para::ParagraphBuilder::make(paragraphStyle, _fontCollection, unicode);
   }
 
 private: