From ee437bf904f7d83ee5c98eb90abbc6ffb1b33d0a Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@meta.com>
Date: Sat, 10 Dec 2022 10:30:47 -0800
Subject: [PATCH] Delete isRootComponent method

Summary:
Delete isRootComponent method, since it's not necessary anymore

changelog: [internal] internal

Reviewed By: javache

Differential Revision: D41638887

fbshipit-source-id: d1d58e07684cb8fd0fc48cfa1f3f92434c1d14c4
---
 ReactAndroid/src/main/jni/react/fabric/Binding.cpp     | 10 ----------
 .../jni/react/fabric/ComponentRegistryResolver.cpp     | 10 ----------
 .../main/jni/react/fabric/ComponentRegistryResolver.h  |  2 --
 .../src/main/jni/react/fabric/CppComponentRegistry.cpp |  4 ----
 .../src/main/jni/react/fabric/CppComponentRegistry.h   |  4 ----
 .../main/jni/react/fabric/FabricMountingManager.cpp    |  7 -------
 6 files changed, 37 deletions(-)

diff --git a/ReactAndroid/src/main/jni/react/fabric/Binding.cpp b/ReactAndroid/src/main/jni/react/fabric/Binding.cpp
index e48202052a6..7f09dd15124 100644
--- a/ReactAndroid/src/main/jni/react/fabric/Binding.cpp
+++ b/ReactAndroid/src/main/jni/react/fabric/Binding.cpp
@@ -517,16 +517,6 @@ void Binding::preallocateView(
     SurfaceId surfaceId,
     ShadowNode const &shadowNode) {
   auto name = std::string(shadowNode.getComponentName());
-
-  // Disable preallocation in java for C++ view managers
-  // RootComponents that are implmented as C++ view managers are still
-  // preallocated (this could be avoided by using Portals)
-  if (sharedCppComponentRegistry_ && sharedCppComponentRegistry_.get() &&
-      sharedCppComponentRegistry_->containsComponentManager(name) &&
-      !sharedCppComponentRegistry_->isRootComponent(name)) {
-    return;
-  }
-
   auto shadowView = ShadowView(shadowNode);
   auto mountingManager = verifyMountingManager("Binding::preallocateView");
   if (!mountingManager) {
diff --git a/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.cpp b/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.cpp
index 5560590ac21..b015943b248 100644
--- a/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.cpp
+++ b/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.cpp
@@ -37,15 +37,5 @@ ComponentRegistryResolver::getComponentManager(
   return nullptr;
 }
 
-bool ComponentRegistryResolver::isRootComponent(
-    std::string componentName) const {
-  auto iterator = resolverMap_.find(componentName);
-  if (iterator != resolverMap_.end()) {
-    return iterator->second.isRootComponent;
-  }
-
-  return false;
-}
-
 } // namespace react
 } // namespace facebook
diff --git a/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.h b/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.h
index 5d8adec466a..662c7df9b2b 100644
--- a/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.h
+++ b/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.h
@@ -34,8 +34,6 @@ class ComponentRegistryResolver {
 
   bool containsComponentManager(std::string componentName) const;
 
-  bool isRootComponent(std::string componentName) const;
-
   std::shared_ptr<facebook::react::ComponentManager> getComponentManager(
       std::string name) const;
 
diff --git a/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.cpp b/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.cpp
index 1a02370284c..35d3d5e3479 100644
--- a/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.cpp
+++ b/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.cpp
@@ -42,9 +42,5 @@ CppComponentRegistry::getComponentManager(const std::string &name) const {
   return componentManagerResolver_.getComponentManager(name);
 }
 
-bool CppComponentRegistry::isRootComponent(std::string name) const {
-  return componentManagerResolver_.isRootComponent(name);
-}
-
 } // namespace react
 } // namespace facebook
diff --git a/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.h b/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.h
index bc6fa330a0e..c5f84996351 100644
--- a/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.h
+++ b/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.h
@@ -35,15 +35,11 @@ class CppComponentRegistry : public jni::HybridClass<CppComponentRegistry> {
       std::function<std::shared_ptr<facebook::react::ComponentManager>(
           const std::string &name)> f);
 
-  bool isRootComponent(std::string name) const;
-
   bool containsComponentManager(std::string name) const;
 
   std::shared_ptr<facebook::react::ComponentManager> getComponentManager(
       const std::string &name) const;
 
-  void deleteComponentInstance(Tag tag) const;
-
  private:
   static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
   ComponentRegistryResolver componentManagerResolver_{};
diff --git a/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp b/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp
index b260c0288df..af63b20eb92 100644
--- a/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp
+++ b/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp
@@ -324,13 +324,6 @@ void FabricMountingManager::executeMount(
         if (cppComponentRegistry_->containsComponentManager(name)) {
           // is this thread safe?
           cppViewMutations.push_back(mutation);
-
-          // This is a hack that could be avoided by using Portals
-          // Only execute mutations instructions for Root C++ ViewManagers
-          // because Root C++ Components have a Android view counterpart.
-          if (!cppComponentRegistry_->isRootComponent(name)) {
-            continue;
-          }
         }
       }