fix(⬆️): Upgrade to Skia m130 (#2648)

Author: wcandillon

.gitignore

@@ -50,8 +50,8 @@ local.properties
 .settings/
 
 # Externals
-libs
-package/cpp/skia/
+packages/skia/libs
+packages/skia/cpp/skia/
 
 # BUCK
 buck-out/

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "externals/skia"]
 	path = externals/skia
 	url = https://chromium.googlesource.com/skia/
-	branch = chrome/m123
+	branch = chrome/m130
 [submodule "externals/depot_tools"]
 	path = externals/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git

apps/docs/static/img/displacement-map.png

@@ -1911,7 +1911,7 @@ SPEC CHECKSUMS:
   React-Mapbuffer: 1c08607305558666fd16678b85ef135e455d5c96
   React-microtasksnativemodule: 87b8de96f937faefece8afd2cb3a518321b2ef99
   react-native-safe-area-context: ab8f4a3d8180913bd78ae75dd599c94cce3d5e9a
-  react-native-skia: 94c1a75519ba65c8450f21867358739486b1992b
+  react-native-skia: b1f33ae82bb728aee1d1602a6adfaee52af43f61
   react-native-slider: 97ce0bd921f40de79cead9754546d5e4e7ba44f8
   React-nativeconfig: 57781b79e11d5af7573e6f77cbf1143b71802a6d
   React-NativeModulesApple: 7ff2e2cfb2e5fa5bdedcecf28ce37e696c6ef1e1

apps/paper/ios/Podfile.lock

@@ -10,7 +10,8 @@ set (SKIA_LIB "skia")
 set (SKIA_SVG_LIB "svg")
 set (SKIA_SKSHAPER_LIB "skshaper")
 set (SKIA_SKPARAGRAPH_LIB "skparagraph")
-set (SKIA_SKUNICODE_LIB "skunicode")
+set (SKIA_SKUNICODE_CORE_LIB "skunicode_core")
+set (SKIA_SKUNICODE_ICU_LIB "skunicode_icu")
 
 # Clear some variables
 unset(LIBRN_DIR CACHE)
@@ -116,8 +117,11 @@ set_property(TARGET skshaper PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libsk
 add_library(skparagraph STATIC IMPORTED)
 set_property(TARGET skparagraph PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskparagraph.a")
 
-add_library(skunicode STATIC IMPORTED)
-set_property(TARGET skunicode PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskunicode.a")
+add_library(skunicode_core STATIC IMPORTED)
+set_property(TARGET skunicode_core PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskunicode_core.a")
+
+add_library(skunicode_icu STATIC IMPORTED)
+set_property(TARGET skunicode_icu PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskunicode_icu.a")
 
 
 find_library(
@@ -235,7 +239,8 @@ target_link_libraries(
         ${SKIA_SVG_LIB}
         ${SKIA_SKSHAPER_LIB}
         ${SKIA_SKPARAGRAPH_LIB}
-        ${SKIA_SKUNICODE_LIB}
+        ${SKIA_SKUNICODE_CORE_LIB}
+        ${SKIA_SKUNICODE_ICU_LIB}
         ${SKIA_LIB}
         -ljnigraphics
         -lGLESv2

apps/paper/ios/paper.xcodeproj/project.pbxproj

@@ -27,7 +27,6 @@
 #include "include/pathops/SkPathOps.h"
 #include "include/utils/SkParsePath.h"
 #include "include/utils/SkTextUtils.h"
-#include "src/core/SkPathPriv.h"
 
 #pragma clang diagnostic pop
 
@@ -510,51 +509,54 @@ class JsiSkPath : public JsiSkWrappingSharedPtrHostObject<SkPath> {
     return jsi::Object::createFromHostObject(
         runtime, std::make_shared<JsiSkPath>(getContext(), std::move(result)));
   }
-
   JSI_HOST_FUNCTION(toCmds) {
     auto path = *getObject();
-    auto cmds = jsi::Array(runtime, path.countVerbs());
-    auto j = 0;
-    for (auto [verb, pts, w] : SkPathPriv::Iterate(path)) {
+    std::vector<jsi::Array> cmdList;
+    SkPoint pts[4];
+    SkPath::Iter iter(path, false);
+    SkPath::Verb verb;
+
+    while ((verb = iter.next(pts)) != SkPath::kDone_Verb) {
       switch (verb) {
-      case SkPathVerb::kMove: {
+      case SkPath::kMove_Verb: {
         auto cmd = jsi::Array(runtime, 3);
         cmd.setValueAtIndex(runtime, 0, static_cast<double>(MOVE));
         cmd.setValueAtIndex(runtime, 1, static_cast<double>(pts[0].x()));
         cmd.setValueAtIndex(runtime, 2, static_cast<double>(pts[0].y()));
-        cmds.setValueAtIndex(runtime, j, cmd);
+        cmdList.push_back(std::move(cmd));
         break;
       }
-      case SkPathVerb::kLine: {
+      case SkPath::kLine_Verb: {
         auto cmd = jsi::Array(runtime, 3);
         cmd.setValueAtIndex(runtime, 0, static_cast<double>(LINE));
         cmd.setValueAtIndex(runtime, 1, static_cast<double>(pts[1].x()));
         cmd.setValueAtIndex(runtime, 2, static_cast<double>(pts[1].y()));
-        cmds.setValueAtIndex(runtime, j, cmd);
+        cmdList.push_back(std::move(cmd));
         break;
       }
-      case SkPathVerb::kQuad: {
+      case SkPath::kQuad_Verb: {
         auto cmd = jsi::Array(runtime, 5);
         cmd.setValueAtIndex(runtime, 0, static_cast<double>(QUAD));
         cmd.setValueAtIndex(runtime, 1, static_cast<double>(pts[1].x()));
         cmd.setValueAtIndex(runtime, 2, static_cast<double>(pts[1].y()));
         cmd.setValueAtIndex(runtime, 3, static_cast<double>(pts[2].x()));
         cmd.setValueAtIndex(runtime, 4, static_cast<double>(pts[2].y()));
-        cmds.setValueAtIndex(runtime, j, cmd);
+        cmdList.push_back(std::move(cmd));
         break;
       }
-      case SkPathVerb::kConic: {
+      case SkPath::kConic_Verb: {
         auto cmd = jsi::Array(runtime, 6);
         cmd.setValueAtIndex(runtime, 0, static_cast<double>(CONIC));
         cmd.setValueAtIndex(runtime, 1, static_cast<double>(pts[1].x()));
         cmd.setValueAtIndex(runtime, 2, static_cast<double>(pts[1].y()));
         cmd.setValueAtIndex(runtime, 3, static_cast<double>(pts[2].x()));
         cmd.setValueAtIndex(runtime, 4, static_cast<double>(pts[2].y()));
-        cmd.setValueAtIndex(runtime, 5, static_cast<double>(*w));
-        cmds.setValueAtIndex(runtime, j, cmd);
+        cmd.setValueAtIndex(runtime, 5,
+                            static_cast<double>(iter.conicWeight()));
+        cmdList.push_back(std::move(cmd));
         break;
       }
-      case SkPathVerb::kCubic: {
+      case SkPath::kCubic_Verb: {
         auto cmd = jsi::Array(runtime, 7);
         cmd.setValueAtIndex(runtime, 0, static_cast<double>(CUBIC));
         cmd.setValueAtIndex(runtime, 1, static_cast<double>(pts[1].x()));
@@ -563,18 +565,26 @@ class JsiSkPath : public JsiSkWrappingSharedPtrHostObject<SkPath> {
         cmd.setValueAtIndex(runtime, 4, static_cast<double>(pts[2].y()));
         cmd.setValueAtIndex(runtime, 5, static_cast<double>(pts[3].x()));
         cmd.setValueAtIndex(runtime, 6, static_cast<double>(pts[3].y()));
-        cmds.setValueAtIndex(runtime, j, cmd);
+        cmdList.push_back(std::move(cmd));
         break;
       }
-      case SkPathVerb::kClose: {
+      case SkPath::kClose_Verb: {
         auto cmd = jsi::Array(runtime, 1);
         cmd.setValueAtIndex(runtime, 0, static_cast<double>(CLOSE));
-        cmds.setValueAtIndex(runtime, j, cmd);
+        cmdList.push_back(std::move(cmd));
         break;
       }
+      default:
+        break;
       }
-      j++;
     }
+
+    // Create the jsi::Array with the exact size
+    auto cmds = jsi::Array(runtime, cmdList.size());
+    for (size_t i = 0; i < cmdList.size(); ++i) {
+      cmds.setValueAtIndex(runtime, i, cmdList[i]);
+    }
+
     return cmds;
   }
 

apps/paper/ios/paper.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -22,6 +22,13 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
+// Helper to see a bit pattern as a float (w/o aliasing warnings)
+static inline float SkBits2Float(uint32_t bits) {
+  float value;
+  memcpy(&value, &bits, sizeof(float));
+  return value;
+}
+
 struct RuntimeEffectUniform {
   int columns;
   int rows;