From e26c280782de07fc5ad8e2f138e02b450207111d Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Thu, 10 Sep 2020 18:14:05 -0700
Subject: [PATCH] Remove enableFabricStartSurfaceWithLayoutMetrics feature flag

Summary:
Remove `enableFabricStartSurfaceWithLayoutMetrics` and treat as `true` always from now on.

Changelog: [Internal]

Differential Revision: D23633198

fbshipit-source-id: 5b7455b87e578ffa97d80746fa901cd2b50d3ea9
---
 .../facebook/react/ReactInstanceManager.java  | 46 ++++++-------------
 .../react/config/ReactFeatureFlags.java       |  3 --
 2 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 7807b98c909..d685867afbb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -1151,30 +1151,18 @@ public class ReactInstanceManager {
 
     final int rootTag;
 
-    if (ReactFeatureFlags.enableFabricStartSurfaceWithLayoutMetrics) {
-      if (reactRoot.getUIManagerType() == FABRIC) {
-        rootTag =
-            uiManager.startSurface(
-                reactRoot.getRootViewGroup(),
-                reactRoot.getJSModuleName(),
-                initialProperties == null
-                    ? new WritableNativeMap()
-                    : Arguments.fromBundle(initialProperties),
-                reactRoot.getWidthMeasureSpec(),
-                reactRoot.getHeightMeasureSpec());
-        reactRoot.setRootViewTag(rootTag);
-        reactRoot.setShouldLogContentAppeared(true);
-      } else {
-        rootTag =
-            uiManager.addRootView(
-                reactRoot.getRootViewGroup(),
-                initialProperties == null
-                    ? new WritableNativeMap()
-                    : Arguments.fromBundle(initialProperties),
-                reactRoot.getInitialUITemplate());
-        reactRoot.setRootViewTag(rootTag);
-        reactRoot.runApplication();
-      }
+    if (reactRoot.getUIManagerType() == FABRIC) {
+      rootTag =
+          uiManager.startSurface(
+              reactRoot.getRootViewGroup(),
+              reactRoot.getJSModuleName(),
+              initialProperties == null
+                  ? new WritableNativeMap()
+                  : Arguments.fromBundle(initialProperties),
+              reactRoot.getWidthMeasureSpec(),
+              reactRoot.getHeightMeasureSpec());
+      reactRoot.setRootViewTag(rootTag);
+      reactRoot.setShouldLogContentAppeared(true);
     } else {
       rootTag =
           uiManager.addRootView(
@@ -1184,15 +1172,7 @@ public class ReactInstanceManager {
                   : Arguments.fromBundle(initialProperties),
               reactRoot.getInitialUITemplate());
       reactRoot.setRootViewTag(rootTag);
-      if (reactRoot.getUIManagerType() == FABRIC) {
-        // Fabric requires to call updateRootLayoutSpecs before starting JS Application,
-        // this ensures the root will hace the correct pointScaleFactor.
-        uiManager.updateRootLayoutSpecs(
-            rootTag, reactRoot.getWidthMeasureSpec(), reactRoot.getHeightMeasureSpec());
-        reactRoot.setShouldLogContentAppeared(true);
-      } else {
-        reactRoot.runApplication();
-      }
+      reactRoot.runApplication();
     }
 
     Systrace.beginAsyncSection(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
index 6c2bd52a80f..b83c4c821d9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
@@ -63,9 +63,6 @@ public class ReactFeatureFlags {
   /** Feature flag to configure eager initialization of Fabric */
   public static boolean eagerInitializeFabric = false;
 
-  /** Feature flag to configure initialization of Fabric surfaces. */
-  public static boolean enableFabricStartSurfaceWithLayoutMetrics = true;
-
   /** Feature flag to use stopSurface when ReactRootView is unmounted. */
   public static boolean enableStopSurfaceOnRootViewUnmount = false;