Refactor: Move RuntimeExecutor into Instance.cpp

Summary:
RuntimeExecutor is currently declared inside NativeToJsBridge. It doesn't need to be: Instance.cpp can use NativeToJsBridge::runOnExecutorQueue to schedule work on the JS Thread. So, this diff moves RuntimeExecutor out of NativeToJsBridge into Instance.cpp. Now, both the JS CallInvoker and the RuntimeExecutor are declared in the same file.

Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D27975840

fbshipit-source-id: aa06f479fa24bb7a15bfd21712df5414a183266c

Author: RSNara

ReactCommon/cxxreact/Instance.cpp

@@ -7,6 +7,7 @@
 
 #include "Instance.h"
 
+#include "ErrorUtils.h"
 #include "JSBigString.h"
 #include "JSBundleType.h"
 #include "JSExecutor.h"
@@ -245,8 +246,27 @@ std::shared_ptr<CallInvoker> Instance::getJSCallInvoker() {
   return std::static_pointer_cast<CallInvoker>(jsCallInvoker_);
 }
 
+// TODO: Unify with JS CallInvoker
 RuntimeExecutor Instance::getRuntimeExecutor() {
-  return nativeToJsBridge_->getRuntimeExecutor();
+  std::weak_ptr<NativeToJsBridge> weakNativeToJsBridge = nativeToJsBridge_;
+
+  auto runtimeExecutor =
+      [weakNativeToJsBridge](
+          std::function<void(jsi::Runtime & runtime)> &&callback) {
+        if (auto strongNativeToJsBridge = weakNativeToJsBridge.lock()) {
+          strongNativeToJsBridge->runOnExecutorQueue(
+              [callback = std::move(callback)](JSExecutor *executor) {
+                jsi::Runtime *runtime =
+                    (jsi::Runtime *)executor->getJavaScriptContext();
+                try {
+                  callback(*runtime);
+                } catch (jsi::JSError &originalError) {
+                  handleJSError(*runtime, originalError, true);
+                }
+              });
+        }
+      };
+  return runtimeExecutor;
 }
 
 std::shared_ptr<CallInvoker> Instance::getDecoratedNativeCallInvoker(

ReactCommon/cxxreact/NativeToJsBridge.cpp

@@ -340,26 +340,5 @@ std::shared_ptr<CallInvoker> NativeToJsBridge::getDecoratedNativeCallInvoker(
   return std::make_shared<NativeCallInvoker>(m_delegate, nativeInvoker);
 }
 
-RuntimeExecutor NativeToJsBridge::getRuntimeExecutor() {
-  auto runtimeExecutor =
-      [this, isDestroyed = m_destroyed](
-          std::function<void(jsi::Runtime & runtime)> &&callback) {
-        if (*isDestroyed) {
-          return;
-        }
-        runOnExecutorQueue(
-            [callback = std::move(callback)](JSExecutor *executor) {
-              jsi::Runtime *runtime =
-                  (jsi::Runtime *)executor->getJavaScriptContext();
-              try {
-                callback(*runtime);
-              } catch (jsi::JSError &originalError) {
-                handleJSError(*runtime, originalError, true);
-              }
-            });
-      };
-  return runtimeExecutor;
-}
-
 } // namespace react
 } // namespace facebook

ReactCommon/cxxreact/NativeToJsBridge.h

@@ -107,12 +107,6 @@ class NativeToJsBridge {
   std::shared_ptr<CallInvoker> getDecoratedNativeCallInvoker(
       std::shared_ptr<CallInvoker> nativeInvoker);
 
-  /**
-   * RuntimeExecutor is used on Android to access the jsi::Runtime from Fabric
-   * and TurboModules
-   */
-  RuntimeExecutor getRuntimeExecutor();
-
  private:
   // This is used to avoid a race condition where a proxyCallback gets queued
   // after ~NativeToJsBridge(), on the same thread. In that case, the callback