From 8bd1f3fbfa20940d5865d541b2288f53ccd829e5 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@meta.com>
Date: Wed, 30 Oct 2024 12:06:27 -0700
Subject: [PATCH] Back out "surface setup issues in EventBeat and Scheduler"
 (#47312)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/47312

changelog: [internal]

Original commit changeset: 5e044e1e6b02

Original Phabricator Diff: D65001802

Reviewed By: rshest

Differential Revision: D65210838

fbshipit-source-id: 90d9db256374f32d2efc366fe120bf677639e67e
---
 .../ReactCommon/react/renderer/core/EventBeat.cpp   |  4 ----
 .../react/renderer/scheduler/Scheduler.cpp          | 13 ++++++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventBeat.cpp b/packages/react-native/ReactCommon/react/renderer/core/EventBeat.cpp
index 82f18533a9d..305c2375224 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/EventBeat.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/core/EventBeat.cpp
@@ -7,7 +7,6 @@
 
 #include "EventBeat.h"
 
-#include <react/debug/react_native_assert.h>
 #include <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #include <utility>
 
@@ -19,9 +18,6 @@ EventBeat::EventBeat(
     : ownerBox_(std::move(ownerBox)), runtimeScheduler_(runtimeScheduler) {}
 
 void EventBeat::request() const {
-  react_native_assert(
-      beatCallback_ &&
-      "Unexpected state: EventBeat::setBeatCallback was not called before EventBeat::request.");
   isRequested_ = true;
 }
 
diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp
index 6950740f71a..3519fa025d7 100644
--- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp
@@ -54,18 +54,17 @@ Scheduler::Scheduler(
   auto weakRuntimeScheduler =
       contextContainer_->find<std::weak_ptr<RuntimeScheduler>>(
           "RuntimeScheduler");
-  react_native_assert(
-      weakRuntimeScheduler.has_value() &&
-      "Unexpected state: RuntimeScheduler was not provided.");
+  auto runtimeScheduler = weakRuntimeScheduler.has_value()
+      ? weakRuntimeScheduler.value().lock()
+      : nullptr;
 
-  auto runtimeScheduler = weakRuntimeScheduler.value().lock();
-
-  if (ReactNativeFeatureFlags::enableUIConsistency()) {
+  if (runtimeScheduler && ReactNativeFeatureFlags::enableUIConsistency()) {
     runtimeScheduler->setShadowTreeRevisionConsistencyManager(
         uiManager->getShadowTreeRevisionConsistencyManager());
   }
 
-  if (ReactNativeFeatureFlags::enableReportEventPaintTime()) {
+  if (runtimeScheduler &&
+      ReactNativeFeatureFlags::enableReportEventPaintTime()) {
     runtimeScheduler->setEventTimingDelegate(eventPerformanceLogger_.get());
   }