fix(🏞️): throw error if makeNonImageTexture() is invoked in the wrong context (#3418)

Author: wcandillon

packages/skia/cpp/api/JsiSkCanvas.h

@@ -34,7 +34,10 @@
 #include "include/core/SkRegion.h"
 #include "include/core/SkSurface.h"
 #include "include/core/SkTypeface.h"
+
+#if !defined(SK_GRAPHITE)
 #include "include/gpu/ganesh/GrDirectContext.h"
+#endif
 
 #pragma clang diagnostic pop
 

packages/skia/cpp/api/JsiSkImage.h

@@ -17,6 +17,8 @@
 #if defined(SK_GRAPHITE)
 #include "RNDawnContext.h"
 #include "include/gpu/graphite/Context.h"
+#else
+#include "include/gpu/ganesh/GrDirectContext.h"
 #endif
 
 #pragma clang diagnostic push
@@ -241,7 +243,15 @@ class JsiSkImage : public JsiSkWrappingSkPtrHostObject<SkImage> {
     auto rasterImage = DawnContext::getInstance().MakeRasterImage(getObject());
 #else
     auto grContext = getContext()->getDirectContext();
-    auto rasterImage = getObject()->makeRasterImage(grContext);
+    auto image = getObject();
+    if (!grContext) {
+      throw jsi::JSError(runtime, "No GPU context available");
+    }
+    if (image && !image->isValid(grContext->asRecorder())) {
+      throw jsi::JSError(runtime, "invoked makeNonTextureImage() on an image "
+                                  "that does not belong to this context");
+    }
+    auto rasterImage = image->makeRasterImage(grContext);
 #endif
     auto hostObjectInstance =
         std::make_shared<JsiSkImage>(getContext(), std::move(rasterImage));
@@ -312,4 +322,4 @@ class JsiSkImage : public JsiSkWrappingSkPtrHostObject<SkImage> {
   }
 };
 
-} // namespace RNSkia
+} // namespace RNSkia

packages/skia/cpp/api/JsiSkSVG.h

@@ -23,9 +23,7 @@ class JsiSkSVG : public JsiSkWrappingSkPtrHostObject<SkSVGDOM> {
   JsiSkSVG(std::shared_ptr<RNSkPlatformContext> context, sk_sp<SkSVGDOM> svgdom,
            sk_sp<skresources::ResourceProvider> resourceProvider = nullptr)
       : JsiSkWrappingSkPtrHostObject<SkSVGDOM>(std::move(context),
-                                               std::move(svgdom)) {
-
-  }
+                                               std::move(svgdom)) {}
 
   ~JsiSkSVG() = default;
 

packages/skia/cpp/api/JsiSkSVGFactory.h

@@ -50,8 +50,7 @@ class SVGAssetProvider : public skresources::ResourceProvider {
 private:
   explicit SVGAssetProvider(AssetMap assets,
                             skresources::ImageDecodeStrategy strategy)
-      : fAssets(std::move(assets)), fStrategy(strategy) {
-  }
+      : fAssets(std::move(assets)), fStrategy(strategy) {}
   const AssetMap fAssets;
   const skresources::ImageDecodeStrategy fStrategy;
 };
@@ -101,9 +100,9 @@ class JsiSkSVGFactory : public JsiSkHostObject {
 
 private:
   jsi::Value makeSVGFromStream(jsi::Runtime &runtime,
-                                 std::unique_ptr<SkMemoryStream> stream,
-                                 sk_sp<SkFontMgr> fontMgr,
-                                 SVGAssetProvider::AssetMap assets) {
+                               std::unique_ptr<SkMemoryStream> stream,
+                               sk_sp<SkFontMgr> fontMgr,
+                               SVGAssetProvider::AssetMap assets) {
     auto builder = SkSVGDOM::Builder();
 
     if (fontMgr) {
@@ -113,15 +112,15 @@ class JsiSkSVGFactory : public JsiSkHostObject {
     auto baseProvider = SVGAssetProvider::Make(
         std::move(assets), skresources::ImageDecodeStrategy::kPreDecode);
     auto provider = skresources::DataURIResourceProviderProxy::Make(
-        std::move(baseProvider), skresources::ImageDecodeStrategy::kPreDecode, fontMgr);
+        std::move(baseProvider), skresources::ImageDecodeStrategy::kPreDecode,
+        fontMgr);
 
     // TODO: this sk_sp subclassing issue needs to be fixed.
     provider->ref();
     builder.setResourceProvider(provider);
 
     auto svg_dom = builder.make(*stream);
-    auto svg =
-        std::make_shared<JsiSkSVG>(getContext(), std::move(svg_dom));
+    auto svg = std::make_shared<JsiSkSVG>(getContext(), std::move(svg_dom));
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, svg,
                                                        getContext());
   }
@@ -140,7 +139,8 @@ class JsiSkSVGFactory : public JsiSkHostObject {
     auto assets = count > 2 ? parseAssetMap(runtime, arguments[2])
                             : SVGAssetProvider::AssetMap();
 
-    return makeSVGFromStream(runtime, std::move(stream), fontMgr, std::move(assets));
+    return makeSVGFromStream(runtime, std::move(stream), fontMgr,
+                             std::move(assets));
   }
 
   JSI_HOST_FUNCTION(MakeFromString) {
@@ -156,7 +156,8 @@ class JsiSkSVGFactory : public JsiSkHostObject {
     auto assets = count > 2 ? parseAssetMap(runtime, arguments[2])
                             : SVGAssetProvider::AssetMap();
 
-    return makeSVGFromStream(runtime, std::move(stream), fontMgr, std::move(assets));
+    return makeSVGFromStream(runtime, std::move(stream), fontMgr,
+                             std::move(assets));
   }
 
   size_t getMemoryPressure() const override { return 512; }