Stop all surfaces on SurfaceManager destruction (#48481)

Summary: [Changelog] [Internal] - Stop all surfaces on SurfaceManager destruction Reviewed By: zeyap Differential Revision: D67809574
facebook · Jan 4, 2025 · 6e42504 · 6e42504
1 parent a6e6f5e
commit 6e42504
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp
@@ -14,6 +14,10 @@ namespace facebook::react {
 SurfaceManager::SurfaceManager(const Scheduler& scheduler) noexcept
     : scheduler_(scheduler) {}
 
+SurfaceManager::~SurfaceManager() noexcept {
+  stopAllSurfaces();
+}
+
 void SurfaceManager::startSurface(
     SurfaceId surfaceId,
     const std::string& moduleName,
@@ -58,6 +62,19 @@ void SurfaceManager::stopSurface(SurfaceId surfaceId) const noexcept {
   }
 }
 
+void SurfaceManager::stopAllSurfaces() const noexcept {
+  std::unordered_set<SurfaceId> surfaceIds;
+  {
+    std::shared_lock lock(mutex_);
+    for (const auto& [surfaceId, _] : registry_) {
+      surfaceIds.insert(surfaceId);
+    }
+  }
+  for (const auto& surfaceId : surfaceIds) {
+    stopSurface(surfaceId);
+  }
+}
+
 Size SurfaceManager::measureSurface(
     SurfaceId surfaceId,
     const LayoutConstraints& layoutConstraints,

diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h
@@ -27,6 +27,7 @@ namespace facebook::react {
 class SurfaceManager final {
  public:
   explicit SurfaceManager(const Scheduler& scheduler) noexcept;
+  ~SurfaceManager() noexcept;
 
 #pragma mark - Surface Management
 
@@ -44,6 +45,8 @@ class SurfaceManager final {
 
   void stopSurface(SurfaceId surfaceId) const noexcept;
 
+  void stopAllSurfaces() const noexcept;
+
   Size measureSurface(
       SurfaceId surfaceId,
       const LayoutConstraints& layoutConstraints,