Upgrade to m119 (#1916)

Shopify · Oct 19, 2023 · 0121d4f · 0121d4f
1 parent cd21dce
commit 0121d4f
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 14 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "externals/skia"]
 	path = externals/skia
 	url = https://chromium.googlesource.com/skia/
-	branch = chrome/m116
+	branch = chrome/m119
 [submodule "externals/depot_tools"]
 	path = externals/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -666,7 +666,7 @@ SPEC CHECKSUMS:
   React-jsinspector: 9885f6f94d231b95a739ef7bb50536fb87ce7539
   React-logger: 3f8ebad1be1bf3299d1ab6d7f971802d7395c7ef
   react-native-safe-area-context: dfe5aa13bee37a0c7e8059d14f72ffc076d120e9
-  react-native-skia: 54fc333c477cc04df78b87b03e87b7e112bc3f47
+  react-native-skia: 98b02a2b122c02f7b13dc4a990ee1d9cec2cb07b
   React-perflogger: 2d505bbe298e3b7bacdd9e542b15535be07220f6
   React-RCTActionSheet: 0e96e4560bd733c9b37efbf68f5b1a47615892fb
   React-RCTAnimation: fd138e26f120371c87e406745a27535e2c8a04ef

diff --git a/externals/depot_tools b/externals/depot_tools
diff --git a/externals/skia b/externals/skia
diff --git a/package/android/cpp/rnskia-android/SkiaOpenGLHelper.h b/package/android/cpp/rnskia-android/SkiaOpenGLHelper.h
@@ -16,6 +16,7 @@
 #include "SkColorSpace.h"
 #include "SkSurface.h"
 #include "include/gpu/GrDirectContext.h"
+#include "include/gpu/ganesh/gl/GrGLDirectContext.h"
 #include "include/gpu/gl/GrGLInterface.h"
 
 #pragma clang diagnostic pop
@@ -270,10 +271,10 @@ class SkiaOpenGLHelper {
 
       // Create the Skia context
       auto backendInterface = GrGLMakeNativeInterface();
-      context->directContext = GrDirectContext::MakeGL(backendInterface);
+      context->directContext = GrDirectContexts::MakeGL(backendInterface);
 
       if (context->directContext == nullptr) {
-        RNSkLogger::logToConsole("GrDirectContext::MakeGL failed");
+        RNSkLogger::logToConsole("GrDirectContexts::MakeGL failed");
         return false;
       }
     }

diff --git a/package/android/cpp/rnskia-android/SkiaOpenGLSurfaceFactory.cpp b/package/android/cpp/rnskia-android/SkiaOpenGLSurfaceFactory.cpp
@@ -1,6 +1,13 @@
 #include "SkiaOpenGLHelper.h"
 #include <SkiaOpenGLSurfaceFactory.h>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "include/gpu/ganesh/gl/GrGLBackendSurface.h"
+
+#pragma clang diagnostic pop
+
 namespace RNSkia {
 
 thread_local SkiaOpenGLContext ThreadContextHolder::ThreadSkiaOpenGLContext;
@@ -103,8 +110,8 @@ sk_sp<SkSurface> WindowSurfaceHolder::getSurface() {
       samples = maxSamples;
     }
 
-    GrBackendRenderTarget renderTarget(_width, _height, samples, stencil,
-                                       fboInfo);
+    auto renderTarget = GrBackendRenderTargets::MakeGL(_width, _height, samples,
+                                                       stencil, fboInfo);
 
     SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
 

diff --git a/package/cpp/api/JsiSkSurface.h b/package/cpp/api/JsiSkSurface.h
@@ -14,6 +14,7 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 
 #include "SkSurface.h"
+#include "include/gpu/GrDirectContext.h"
 
 #pragma clang diagnostic pop
 
@@ -37,7 +38,9 @@ class JsiSkSurface : public JsiSkWrappingSkPtrHostObject<SkSurface> {
   }
 
   JSI_HOST_FUNCTION(flush) {
-    getObject()->flush();
+    if (auto dContext = GrAsDirectContext(getObject()->recordingContext())) {
+      dContext->flushAndSubmit();
+    }
     return jsi::Value::undefined();
   }
 

diff --git a/package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm b/package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm
@@ -88,7 +88,9 @@
     SkCanvas *canvas = skSurface->getCanvas();
     cb(canvas);
 
-    skSurface->flushAndSubmit();
+    if (auto dContext = GrAsDirectContext(skSurface->recordingContext())) {
+      dContext->flushAndSubmit();
+    }
 
     id<MTLCommandBuffer> commandBuffer(
         [ThreadContextHolder::ThreadSkiaMetalContext

diff --git a/package/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.mm b/package/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.mm
@@ -65,7 +65,7 @@
   GrMtlTextureInfo fbInfo;
   fbInfo.fTexture.retain((__bridge void *)texture);
 
-  GrBackendRenderTarget backendRT(width, height, 1, fbInfo);
+  GrBackendRenderTarget backendRT(width, height, fbInfo);
 
   auto skSurface = SkSurfaces::WrapBackendRenderTarget(
       ThreadContextHolder::ThreadSkiaMetalContext.skContext.get(), backendRT,

diff --git a/package/react-native-skia.podspec b/package/react-native-skia.podspec
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   # optional - use expanded license entry instead:
   # s.license    = { :type => "MIT", :file => "LICENSE" }
   s.authors      = { "Your Name" => "[email protected]" }
-  s.platforms    = { :ios => "9.0" }
+  s.platforms    = { :ios => "12.0" }
   s.source       = { :git => "https://github.com/shopify/react-native-skia/react-native-skia.git", :tag => "#{s.version}" }
 
   s.requires_arc = true

diff --git a/scripts/copy-skia-module-headers.ts b/scripts/copy-skia-module-headers.ts
@@ -13,11 +13,10 @@ const copyModule = (module: string) => [
   `cp -a ./externals/skia/modules/skcms/. ./package/cpp/skia/modules/skcms`,
   `mkdir -p ./package/cpp/skia/src/`,
   `mkdir -p ./package/cpp/skia/src/core/`,
+  `cp -a ./externals/skia/src/core/SkPathEnums.h ./package/cpp/skia/src/core/.`,
   `cp -a ./externals/skia/src/core/SkPathPriv.h ./package/cpp/skia/src/core/.`,
   `cp -a ./externals/skia/src/core/SkChecksum.h ./package/cpp/skia/src/core/.`,
   `cp -a ./externals/skia/src/core/SkTHash.h ./package/cpp/skia/src/core/.`,
-  `rm ./package/cpp/skia/include/core/SkICC.h`, // Remove since there are now (Skia M108) two headers with the same name
-  `rm ./package/cpp/skia/include/core/SkEncodedImageFormat.h`, // Remove since there are now (Skia M108) two headers with the same name
 ].map((cmd) => {
   console.log(cmd);
   executeCmdSync(cmd);