diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java index 1565f57e633..e6cad3c2159 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java @@ -44,8 +44,7 @@ public class Binding { Object uiManager, EventBeatManager eventBeatManager, ComponentFactory componentsRegistry, - Object reactNativeConfig, - CppComponentRegistry cppComponentRegistry); + Object reactNativeConfig); public native void startSurface( int surfaceId, @NonNull String moduleName, @NonNull NativeMap initialProps); @@ -92,24 +91,6 @@ public class Binding { @NonNull EventBeatManager eventBeatManager, @NonNull ComponentFactory componentFactory, @NonNull ReactNativeConfig reactNativeConfig) { - register( - runtimeExecutor, - runtimeScheduler, - fabricUIManager, - eventBeatManager, - componentFactory, - reactNativeConfig, - null); - } - - public void register( - @NonNull RuntimeExecutor runtimeExecutor, - @Nullable RuntimeScheduler runtimeScheduler, - @NonNull FabricUIManager fabricUIManager, - @NonNull EventBeatManager eventBeatManager, - @NonNull ComponentFactory componentFactory, - @NonNull ReactNativeConfig reactNativeConfig, - @Nullable CppComponentRegistry cppComponentRegistry) { fabricUIManager.setBinding(this); installFabricUIManager( runtimeExecutor, @@ -117,8 +98,7 @@ public class Binding { fabricUIManager, eventBeatManager, componentFactory, - reactNativeConfig, - cppComponentRegistry); + reactNativeConfig); setPixelDensity(PixelUtil.getDisplayMetricDensity()); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java index 84690939fe5..54a23b48279 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java @@ -61,8 +61,7 @@ public class FabricJSIModuleProvider implements JSIModuleProvider { uiManager, eventBeatManager, mComponentFactory, - mConfig, - mCppComponentRegistry); + mConfig); Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE); Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE); diff --git a/ReactAndroid/src/main/jni/react/fabric/Binding.cpp b/ReactAndroid/src/main/jni/react/fabric/Binding.cpp index 7f09dd15124..c0c6d1be8fa 100644 --- a/ReactAndroid/src/main/jni/react/fabric/Binding.cpp +++ b/ReactAndroid/src/main/jni/react/fabric/Binding.cpp @@ -362,8 +362,7 @@ void Binding::installFabricUIManager( jni::alias_ref javaUIManager, EventBeatManager *eventBeatManager, ComponentFactory *componentsRegistry, - jni::alias_ref reactNativeConfig, - CppComponentRegistry *cppComponentRegistry) { + jni::alias_ref reactNativeConfig) { SystraceSection s("FabricUIManagerBinding::installFabricUIManager"); std::shared_ptr config = @@ -377,19 +376,13 @@ void Binding::installFabricUIManager( << this << ")."; } - // TODO[T135327389]: Investigate why code relying on CppComponentRegistry - // crashing during hot reload restart. - // sharedCppComponentRegistry_ = - // std::shared_ptr( - // cppComponentRegistry ? cppComponentRegistry : nullptr); - // Use std::lock and std::adopt_lock to prevent deadlocks by locking mutexes // at the same time std::unique_lock lock(installMutex_); auto globalJavaUiManager = make_global(javaUIManager); - mountingManager_ = std::make_shared( - config, sharedCppComponentRegistry_, globalJavaUiManager); + mountingManager_ = + std::make_shared(config, globalJavaUiManager); ContextContainer::Shared contextContainer = std::make_shared(); @@ -480,7 +473,6 @@ void Binding::uninstallFabricUIManager() { scheduler_ = nullptr; mountingManager_ = nullptr; reactNativeConfig_ = nullptr; - sharedCppComponentRegistry_ = nullptr; } std::shared_ptr Binding::verifyMountingManager( diff --git a/ReactAndroid/src/main/jni/react/fabric/Binding.h b/ReactAndroid/src/main/jni/react/fabric/Binding.h index c1f4e9d6718..cc233952ae5 100644 --- a/ReactAndroid/src/main/jni/react/fabric/Binding.h +++ b/ReactAndroid/src/main/jni/react/fabric/Binding.h @@ -7,7 +7,6 @@ #pragma once -#include "CppComponentRegistry.h" #include "FabricMountingManager.h" #include @@ -66,8 +65,7 @@ class Binding : public jni::HybridClass, jni::alias_ref javaUIManager, EventBeatManager *eventBeatManager, ComponentFactory *componentsRegistry, - jni::alias_ref reactNativeConfig, - CppComponentRegistry *cppComponentRegistry); + jni::alias_ref reactNativeConfig); void startSurface( jint surfaceId, @@ -151,8 +149,6 @@ class Binding : public jni::HybridClass, float pointScaleFactor_ = 1; std::shared_ptr reactNativeConfig_{nullptr}; - std::shared_ptr - sharedCppComponentRegistry_{nullptr}; bool enableFabricLogs_{false}; }; diff --git a/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp b/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp index af63b20eb92..707ea46e50d 100644 --- a/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp +++ b/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp @@ -38,10 +38,8 @@ static bool getFeatureFlagValue(const char *name) { FabricMountingManager::FabricMountingManager( std::shared_ptr &config, - std::shared_ptr &cppComponentRegistry, global_ref &javaUIManager) : javaUIManager_(javaUIManager), - cppComponentRegistry_(cppComponentRegistry), useOverflowInset_(getFeatureFlagValue("useOverflowInset")) { CoreFeatures::enableMapBuffer = getFeatureFlagValue("useMapBufferProps"); } @@ -314,19 +312,6 @@ void FabricMountingManager::executeMount( auto &index = mutation.index; bool isVirtual = mutation.mutatedViewIsVirtual(); - - // Detect if the mutation instruction belongs to C++ view managers - if (cppComponentRegistry_) { - auto componentName = newChildShadowView.componentName - ? newChildShadowView.componentName - : oldChildShadowView.componentName; - auto name = std::string(componentName); - if (cppComponentRegistry_->containsComponentManager(name)) { - // is this thread safe? - cppViewMutations.push_back(mutation); - } - } - switch (mutationType) { case ShadowViewMutation::Create: { bool allocationCheck = diff --git a/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h b/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h index 6ff958234fc..57e9eff06a6 100644 --- a/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h +++ b/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h @@ -7,7 +7,6 @@ #pragma once -#include "CppComponentRegistry.h" #include "FabricMountItem.h" #include @@ -34,7 +33,6 @@ class FabricMountingManager final { FabricMountingManager( std::shared_ptr &config, - std::shared_ptr &cppComponentRegistry, jni::global_ref &javaUIManager); void onSurfaceStart(SurfaceId surfaceId); @@ -70,7 +68,6 @@ class FabricMountingManager final { butter::map> allocatedViewRegistry_{}; std::recursive_mutex allocatedViewsMutex_; - std::shared_ptr cppComponentRegistry_; bool const useOverflowInset_{false};