Refactor: RuntimeScheduler: Delete ErrorUtils.h (#43953)

RSNara · Titozzz · commit 9bf246cd1eb8 · 2024-06-18T14:29:31.000+02:00
Summary: Pull Request resolved: #43953 RuntimeScheduler's ErrorUtils.h is redundant. Let's just remove it. Changelog: [Internal] Reviewed By: cipolleschi Differential Revision: D55547905 fbshipit-source-id: 5263c9fca8ae32bbfc672f0e16b79ee177cdd421
diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/ErrorUtils.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/ErrorUtils.h
diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp
@@ -13,7 +13,6 @@
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/debug/SystraceSection.h>
 #include <utility>
-#include "ErrorUtils.h"
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.cpp
@@ -8,9 +8,9 @@
 #include "RuntimeScheduler_Legacy.h"
 #include "SchedulerPriorityUtils.h"
 
+#include <cxxreact/ErrorUtils.h>
 #include <react/renderer/debug/SystraceSection.h>
 #include <utility>
-#include "ErrorUtils.h"
 
 namespace facebook::react {
 
@@ -136,7 +136,7 @@ void RuntimeScheduler_Legacy::callExpiredTasks(jsi::Runtime& runtime) {
       executeTask(runtime, topPriorityTask, didUserCallbackTimeout);
     }
   } catch (jsi::JSError& error) {
-    handleFatalError(runtime, error);
+    handleJSError(runtime, error, true);
   }
 
   currentPriority_ = previousPriority;
@@ -182,7 +182,7 @@ void RuntimeScheduler_Legacy::startWorkLoop(jsi::Runtime& runtime) {
       executeTask(runtime, topPriorityTask, didUserCallbackTimeout);
     }
   } catch (jsi::JSError& error) {
-    handleFatalError(runtime, error);
+    handleJSError(runtime, error, true);
   }
 
   currentPriority_ = previousPriority;
diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.cpp
@@ -12,7 +12,6 @@
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/debug/SystraceSection.h>
 #include <utility>
-#include "ErrorUtils.h"
 
 namespace facebook::react {
 
@@ -244,7 +243,7 @@ void RuntimeScheduler_Modern::startWorkLoop(
       executeTask(runtime, *topPriorityTask, currentTime);
     }
   } catch (jsi::JSError& error) {
-    handleFatalError(runtime, error);
+    handleJSError(runtime, error, true);
   }
 
   currentPriority_ = previousPriority;

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`	`#include "RuntimeScheduler_Legacy.h"`
`9`	`9`	`#include "SchedulerPriorityUtils.h"`
`10`	`10`
	`11`	`+#include <cxxreact/ErrorUtils.h>`
`11`	`12`	`#include <react/renderer/debug/SystraceSection.h>`
`12`	`13`	`#include <utility>`
`13`		`-#include "ErrorUtils.h"`
`14`	`14`
`15`	`15`	`namespace facebook::react {`
`16`	`16`
`@@ -136,7 +136,7 @@ void RuntimeScheduler_Legacy::callExpiredTasks(jsi::Runtime& runtime) {`
`136`	`136`	`executeTask(runtime, topPriorityTask, didUserCallbackTimeout);`
`137`	`137`	`}`
`138`	`138`	`} catch (jsi::JSError& error) {`
`139`		`- handleFatalError(runtime, error);`
	`139`	`+ handleJSError(runtime, error, true);`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`currentPriority_ = previousPriority;`
`@@ -182,7 +182,7 @@ void RuntimeScheduler_Legacy::startWorkLoop(jsi::Runtime& runtime) {`
`182`	`182`	`executeTask(runtime, topPriorityTask, didUserCallbackTimeout);`
`183`	`183`	`}`
`184`	`184`	`} catch (jsi::JSError& error) {`
`185`		`- handleFatalError(runtime, error);`
	`185`	`+ handleJSError(runtime, error, true);`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`currentPriority_ = previousPriority;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`#include <react/featureflags/ReactNativeFeatureFlags.h>`
`13`	`13`	`#include <react/renderer/debug/SystraceSection.h>`
`14`	`14`	`#include <utility>`
`15`		`-#include "ErrorUtils.h"`
`16`	`15`
`17`	`16`	`namespace facebook::react {`
`18`	`17`
`@@ -244,7 +243,7 @@ void RuntimeScheduler_Modern::startWorkLoop(`
`244`	`243`	`executeTask(runtime, *topPriorityTask, currentTime);`
`245`	`244`	`}`
`246`	`245`	`} catch (jsi::JSError& error) {`
`247`		`- handleFatalError(runtime, error);`
	`246`	`+ handleJSError(runtime, error, true);`
`248`	`247`	`}`
`249`	`248`
`250`	`249`	`currentPriority_ = previousPriority;`