Merge branch 'main' into fabric-build

Shopify · Nov 24, 2024 · 57bad45 · 57bad45
2 parents 2e637e8 + 412d3a3
commit 57bad45
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/packages/skia/cpp/rnskia/RNSkPlatformContext.h b/packages/skia/cpp/rnskia/RNSkPlatformContext.h
@@ -41,8 +41,7 @@ class RNSkPlatformContext {
                       std::shared_ptr<react::CallInvoker> callInvoker,
                       float pixelDensity)
       : _pixelDensity(pixelDensity), _jsRuntime(runtime),
-        _callInvoker(callInvoker) {
-  }
+        _callInvoker(callInvoker) {}
 
   virtual ~RNSkPlatformContext() = default;
 

diff --git a/packages/skia/cpp/rnskia/RNSkView.h b/packages/skia/cpp/rnskia/RNSkView.h
@@ -173,10 +173,17 @@ class RNSkView : public std::enable_shared_from_this<RNSkView> {
   void requestRedraw() {
     if (!_redrawRequested) {
       _redrawRequested = true;
-      _platformContext->runOnMainThread([this]() {
-        if (_renderer) {
-          _renderer->renderImmediate(_canvasProvider);
-          _redrawRequested = false;
+      // Capture a weak pointer to this
+      auto weakThis = std::weak_ptr<RNSkView>(shared_from_this());
+
+      _platformContext->runOnMainThread([weakThis]() {
+        // Try to lock the weak pointer
+        if (auto strongThis = weakThis.lock()) {
+          // Only proceed if the object still exists
+          if (strongThis->_renderer) {
+            strongThis->_renderer->renderImmediate(strongThis->_canvasProvider);
+            strongThis->_redrawRequested = false;
+          }
         }
       });
     }