From f7385ac1b8eda1cbb54709f2f7eedf9c2b4481ef Mon Sep 17 00:00:00 2001 From: David Vacca Date: Fri, 8 Nov 2019 18:46:57 -0800 Subject: [PATCH] Setup collapsing of mounting instructions as disabled by default Summary: This diff updates the configuration of collapsing of mounting instructions to be disabled by default (in case the user didn't get any value from the server) Changelog: [internal] Reviewed By: JoshuaGross Differential Revision: D18411934 fbshipit-source-id: 21f9ca525c28134800e929407c5a1e29a84de68e --- .../src/main/java/com/facebook/react/fabric/jni/Binding.cpp | 6 +++--- .../src/main/java/com/facebook/react/fabric/jni/Binding.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp index febacf72f85..0f992e70a2f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp @@ -236,9 +236,9 @@ void Binding::installFabricUIManager( // Keep reference to config object and cache some feature flags here reactNativeConfig_ = config; shouldCollateRemovesAndDeletes_ = reactNativeConfig_->getBool("react_fabric:enable_removedelete_collation_android"); - // TODO T56932267: re-enable collapsing of mounting instructions using - // reactNativeConfig_->getBool("react_fabric:enabled_collapse_delete_create_mounting_instructions"); - collapseDeleteCreateMountingInstructions_ = false; + collapseDeleteCreateMountingInstructions_ = reactNativeConfig_->getBool( + "react_fabric:enabled_collapse_delete_create_mounting_instructions"); + ; disablePreallocateViews_ = reactNativeConfig_->getBool("react_fabric:disabled_view_preallocation_android"); diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h index e3439c11a01..8c26a3ccb99 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h @@ -105,7 +105,7 @@ class Binding : public jni::HybridClass, public SchedulerDelegate { std::shared_ptr reactNativeConfig_{nullptr}; bool shouldCollateRemovesAndDeletes_{false}; - bool collapseDeleteCreateMountingInstructions_{true}; + bool collapseDeleteCreateMountingInstructions_{false}; bool disablePreallocateViews_{false}; };