diff --git a/packages/react-native/React/DevSupport/RCTInspectorDevServerHelper.mm b/packages/react-native/React/DevSupport/RCTInspectorDevServerHelper.mm index 4a67767bf85..5eca6c83642 100644 --- a/packages/react-native/React/DevSupport/RCTInspectorDevServerHelper.mm +++ b/packages/react-native/React/DevSupport/RCTInspectorDevServerHelper.mm @@ -182,9 +182,10 @@ static void sendEventToAllConnections(NSString *event) NSString *key = [inspectorURL absoluteString]; id connection = socketConnections[key]; if (!connection || !connection.isConnected) { - if (facebook::react::jsinspector_modern::InspectorFlags::getInstance().getEnableCxxInspectorPackagerConnection()) { + if (facebook::react::jsinspector_modern::InspectorFlags::getInstance().getEnableModernCDPRegistry()) { connection = [[RCTCxxInspectorPackagerConnection alloc] initWithURL:inspectorURL]; } else { + // TODO(T190163403): Remove legacy RCTInspectorPackagerConnection connection = [[RCTInspectorPackagerConnection alloc] initWithURL:inspectorURL]; } diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 474cc058845..6531adbcd6a 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -2182,7 +2182,6 @@ public abstract interface class com/facebook/react/devsupport/HMRClient : com/fa public final class com/facebook/react/devsupport/InspectorFlags { public static final field INSTANCE Lcom/facebook/react/devsupport/InspectorFlags; - public static final fun getEnableCxxInspectorPackagerConnection ()Z public static final fun getEnableModernCDPRegistry ()Z } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java index 09b9b2bace5..a404f3de35c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java @@ -210,10 +210,11 @@ public class DevServerHelper { new AsyncTask() { @Override protected Void doInBackground(Void... params) { - if (InspectorFlags.getEnableCxxInspectorPackagerConnection()) { + if (InspectorFlags.getEnableModernCDPRegistry()) { mInspectorPackagerConnection = new CxxInspectorPackagerConnection(getInspectorDeviceUrl(), mPackageName); } else { + // TODO(T190163403): Remove legacy InspectorPackagerConnection mInspectorPackagerConnection = new InspectorPackagerConnection(getInspectorDeviceUrl(), mPackageName); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorFlags.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorFlags.kt index 9b01f09c679..5b15990e3d2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorFlags.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorFlags.kt @@ -17,6 +17,4 @@ public object InspectorFlags { } @DoNotStrip @JvmStatic public external fun getEnableModernCDPRegistry(): Boolean - - @DoNotStrip @JvmStatic public external fun getEnableCxxInspectorPackagerConnection(): Boolean } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt index 6710de5fbf1..13f4712cdb6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<0ae7be647ca12c3efcc34f6098155550>> + * @generated SignedSource<<53200319e16c1f14028d9cb8a2c87078>> */ /** @@ -106,12 +106,6 @@ public object ReactNativeFeatureFlags { @JvmStatic public fun forceBatchingMountItemsOnAndroid(): Boolean = accessor.forceBatchingMountItemsOnAndroid() - /** - * Flag determining if the C++ implementation of InspectorPackagerConnection should be used instead of the per-platform one. This flag is global and should not be changed across React Host lifetimes. - */ - @JvmStatic - public fun inspectorEnableCxxInspectorPackagerConnection(): Boolean = accessor.inspectorEnableCxxInspectorPackagerConnection() - /** * Flag determining if the modern CDP backend should be enabled. This flag is global and should not be changed across React Host lifetimes. */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt index 49b093d4d2f..8da3e904dcb 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<5323fb8be9ec7ee6ac43d7f01bca020e>> + * @generated SignedSource<<54a79c6e6f4946c4c36692fbc19b927a>> */ /** @@ -33,7 +33,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso private var enableUIConsistencyCache: Boolean? = null private var fixStoppedSurfaceRemoveDeleteTreeUIFrameCallbackLeakCache: Boolean? = null private var forceBatchingMountItemsOnAndroidCache: Boolean? = null - private var inspectorEnableCxxInspectorPackagerConnectionCache: Boolean? = null private var inspectorEnableModernCDPRegistryCache: Boolean? = null private var lazyAnimationCallbacksCache: Boolean? = null private var preventDoubleTextMeasureCache: Boolean? = null @@ -159,15 +158,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso return cached } - override fun inspectorEnableCxxInspectorPackagerConnection(): Boolean { - var cached = inspectorEnableCxxInspectorPackagerConnectionCache - if (cached == null) { - cached = ReactNativeFeatureFlagsCxxInterop.inspectorEnableCxxInspectorPackagerConnection() - inspectorEnableCxxInspectorPackagerConnectionCache = cached - } - return cached - } - override fun inspectorEnableModernCDPRegistry(): Boolean { var cached = inspectorEnableModernCDPRegistryCache if (cached == null) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt index de3f8cb5818..dada724b1cd 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<> + * @generated SignedSource<<4eee31ea22fc4116e9070f714dc59daf>> */ /** @@ -54,8 +54,6 @@ public object ReactNativeFeatureFlagsCxxInterop { @DoNotStrip @JvmStatic public external fun forceBatchingMountItemsOnAndroid(): Boolean - @DoNotStrip @JvmStatic public external fun inspectorEnableCxxInspectorPackagerConnection(): Boolean - @DoNotStrip @JvmStatic public external fun inspectorEnableModernCDPRegistry(): Boolean @DoNotStrip @JvmStatic public external fun lazyAnimationCallbacks(): Boolean diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt index 980ba43a704..16bf8256b2b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<64ab913d2c940a7abfcd2aac32be1b72>> + * @generated SignedSource<> */ /** @@ -49,8 +49,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi override fun forceBatchingMountItemsOnAndroid(): Boolean = false - override fun inspectorEnableCxxInspectorPackagerConnection(): Boolean = false - override fun inspectorEnableModernCDPRegistry(): Boolean = false override fun lazyAnimationCallbacks(): Boolean = false diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt index 4ff04cdf7c1..86d327d978b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<00a695402781a9f3c45ba0594a785b57>> + * @generated SignedSource<> */ /** @@ -37,7 +37,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces private var enableUIConsistencyCache: Boolean? = null private var fixStoppedSurfaceRemoveDeleteTreeUIFrameCallbackLeakCache: Boolean? = null private var forceBatchingMountItemsOnAndroidCache: Boolean? = null - private var inspectorEnableCxxInspectorPackagerConnectionCache: Boolean? = null private var inspectorEnableModernCDPRegistryCache: Boolean? = null private var lazyAnimationCallbacksCache: Boolean? = null private var preventDoubleTextMeasureCache: Boolean? = null @@ -176,16 +175,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces return cached } - override fun inspectorEnableCxxInspectorPackagerConnection(): Boolean { - var cached = inspectorEnableCxxInspectorPackagerConnectionCache - if (cached == null) { - cached = currentProvider.inspectorEnableCxxInspectorPackagerConnection() - accessedFeatureFlags.add("inspectorEnableCxxInspectorPackagerConnection") - inspectorEnableCxxInspectorPackagerConnectionCache = cached - } - return cached - } - override fun inspectorEnableModernCDPRegistry(): Boolean { var cached = inspectorEnableModernCDPRegistryCache if (cached == null) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt index 3cd8ba0e743..a32276ed395 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<> + * @generated SignedSource<> */ /** @@ -49,8 +49,6 @@ public interface ReactNativeFeatureFlagsProvider { @DoNotStrip public fun forceBatchingMountItemsOnAndroid(): Boolean - @DoNotStrip public fun inspectorEnableCxxInspectorPackagerConnection(): Boolean - @DoNotStrip public fun inspectorEnableModernCDPRegistry(): Boolean @DoNotStrip public fun lazyAnimationCallbacks(): Boolean diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/JInspectorFlags.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/JInspectorFlags.cpp index a826068d799..4a1468e4499 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/JInspectorFlags.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/JInspectorFlags.cpp @@ -16,20 +16,11 @@ bool JInspectorFlags::getEnableModernCDPRegistry(jni::alias_ref) { return inspectorFlags.getEnableModernCDPRegistry(); } -bool JInspectorFlags::getEnableCxxInspectorPackagerConnection( - jni::alias_ref) { - auto& inspectorFlags = InspectorFlags::getInstance(); - return inspectorFlags.getEnableCxxInspectorPackagerConnection(); -} - void JInspectorFlags::registerNatives() { javaClassLocal()->registerNatives({ makeNativeMethod( "getEnableModernCDPRegistry", JInspectorFlags::getEnableModernCDPRegistry), - makeNativeMethod( - "getEnableCxxInspectorPackagerConnection", - JInspectorFlags::getEnableCxxInspectorPackagerConnection), }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/JInspectorFlags.h b/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/JInspectorFlags.h index e91e7cc7d5d..a1241ac4728 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/JInspectorFlags.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/JInspectorFlags.h @@ -21,8 +21,6 @@ class JInspectorFlags : public jni::JavaClass { static bool getEnableModernCDPRegistry(jni::alias_ref); - static bool getEnableCxxInspectorPackagerConnection(jni::alias_ref); - static void registerNatives(); private: diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp index 4bfccaff624..af73ae240c4 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<5d0f0b1953af3f0dd2ee66fed2b1115a>> + * @generated SignedSource<> */ /** @@ -117,12 +117,6 @@ class ReactNativeFeatureFlagsProviderHolder return method(javaProvider_); } - bool inspectorEnableCxxInspectorPackagerConnection() override { - static const auto method = - getReactNativeFeatureFlagsProviderJavaClass()->getMethod("inspectorEnableCxxInspectorPackagerConnection"); - return method(javaProvider_); - } - bool inspectorEnableModernCDPRegistry() override { static const auto method = getReactNativeFeatureFlagsProviderJavaClass()->getMethod("inspectorEnableModernCDPRegistry"); @@ -234,11 +228,6 @@ bool JReactNativeFeatureFlagsCxxInterop::forceBatchingMountItemsOnAndroid( return ReactNativeFeatureFlags::forceBatchingMountItemsOnAndroid(); } -bool JReactNativeFeatureFlagsCxxInterop::inspectorEnableCxxInspectorPackagerConnection( - facebook::jni::alias_ref /*unused*/) { - return ReactNativeFeatureFlags::inspectorEnableCxxInspectorPackagerConnection(); -} - bool JReactNativeFeatureFlagsCxxInterop::inspectorEnableModernCDPRegistry( facebook::jni::alias_ref /*unused*/) { return ReactNativeFeatureFlags::inspectorEnableModernCDPRegistry(); @@ -330,9 +319,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() { makeNativeMethod( "forceBatchingMountItemsOnAndroid", JReactNativeFeatureFlagsCxxInterop::forceBatchingMountItemsOnAndroid), - makeNativeMethod( - "inspectorEnableCxxInspectorPackagerConnection", - JReactNativeFeatureFlagsCxxInterop::inspectorEnableCxxInspectorPackagerConnection), makeNativeMethod( "inspectorEnableModernCDPRegistry", JReactNativeFeatureFlagsCxxInterop::inspectorEnableModernCDPRegistry), diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h b/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h index 4b026033b0d..dea29ba7ec9 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<> + * @generated SignedSource<<48f683554e70183664d5a1bf6a7ab328>> */ /** @@ -69,9 +69,6 @@ class JReactNativeFeatureFlagsCxxInterop static bool forceBatchingMountItemsOnAndroid( facebook::jni::alias_ref); - static bool inspectorEnableCxxInspectorPackagerConnection( - facebook::jni::alias_ref); - static bool inspectorEnableModernCDPRegistry( facebook::jni::alias_ref); diff --git a/packages/react-native/ReactCommon/jsinspector-modern/InspectorFlags.cpp b/packages/react-native/ReactCommon/jsinspector-modern/InspectorFlags.cpp index df1b9611622..2de05ff71ec 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/InspectorFlags.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/InspectorFlags.cpp @@ -21,15 +21,6 @@ bool InspectorFlags::getEnableModernCDPRegistry() const { return loadFlagsAndAssertUnchanged().enableModernCDPRegistry; } -bool InspectorFlags::getEnableCxxInspectorPackagerConnection() const { - auto& values = loadFlagsAndAssertUnchanged(); - - return values.enableCxxInspectorPackagerConnection || - // If we are using the modern CDP registry, then we must also use the C++ - // InspectorPackagerConnection implementation. - values.enableModernCDPRegistry; -} - void InspectorFlags::dangerouslyResetFlags() { *this = InspectorFlags{}; } @@ -37,20 +28,13 @@ void InspectorFlags::dangerouslyResetFlags() { const InspectorFlags::Values& InspectorFlags::loadFlagsAndAssertUnchanged() const { InspectorFlags::Values newValues = { - .enableCxxInspectorPackagerConnection = -#ifdef REACT_NATIVE_FORCE_ENABLE_FUSEBOX - true, -#else - ReactNativeFeatureFlags:: - inspectorEnableCxxInspectorPackagerConnection(), -#endif .enableModernCDPRegistry = #ifdef REACT_NATIVE_FORCE_ENABLE_FUSEBOX true, #elif defined(HERMES_ENABLE_DEBUGGER) ReactNativeFeatureFlags::inspectorEnableModernCDPRegistry(), #else - false, + false, #endif }; diff --git a/packages/react-native/ReactCommon/jsinspector-modern/InspectorFlags.h b/packages/react-native/ReactCommon/jsinspector-modern/InspectorFlags.h index 5ed464525d3..670ab1a0915 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/InspectorFlags.h +++ b/packages/react-native/ReactCommon/jsinspector-modern/InspectorFlags.h @@ -24,12 +24,6 @@ class InspectorFlags { */ bool getEnableModernCDPRegistry() const; - /** - * Flag determining if the C++ implementation of InspectorPackagerConnection - * should be used instead of the per-platform one. - */ - bool getEnableCxxInspectorPackagerConnection() const; - /** * Reset flags to their upstream values. The caller must ensure any resources * that have read previous flag values have been cleaned up. @@ -38,7 +32,6 @@ class InspectorFlags { private: struct Values { - bool enableCxxInspectorPackagerConnection; bool enableModernCDPRegistry; bool operator==(const Values&) const = default; }; diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.cpp b/packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.cpp index c49e72c0bb7..6fe559c5b7a 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.cpp @@ -235,14 +235,8 @@ INSTANTIATE_TEST_SUITE_P( ReactInstanceVaryingInspectorFlags, ReactInstanceIntegrationTestWithFlags, ::testing::Values( - InspectorFlagOverrides{ - .enableCxxInspectorPackagerConnection = false, - .enableModernCDPRegistry = false}, - InspectorFlagOverrides{ - .enableCxxInspectorPackagerConnection = true, - .enableModernCDPRegistry = false}, - InspectorFlagOverrides{ - .enableCxxInspectorPackagerConnection = true, - .enableModernCDPRegistry = true})); + InspectorFlagOverrides{.enableModernCDPRegistry = false}, + InspectorFlagOverrides{.enableModernCDPRegistry = false}, + InspectorFlagOverrides{.enableModernCDPRegistry = true})); } // namespace facebook::react::jsinspector_modern diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.h b/packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.h index e141d6925d4..59d5c3942aa 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.h +++ b/packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.h @@ -25,7 +25,6 @@ namespace facebook::react::jsinspector_modern { using namespace ::testing; struct FeatureFlags { - const bool enableCxxInspectorPackagerConnection = true; const bool enableModernCDPRegistry = true; }; diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.cpp b/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.cpp index 2f50fbbd667..87ee8da20ff 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.cpp @@ -26,12 +26,6 @@ class ReactNativeFeatureFlagsOverrides const InspectorFlagOverrides& overrides) : overrides_(overrides) {} - bool inspectorEnableCxxInspectorPackagerConnection() override { - return overrides_.enableCxxInspectorPackagerConnection.value_or( - ReactNativeFeatureFlagsDefaults:: - inspectorEnableCxxInspectorPackagerConnection()); - } - bool inspectorEnableModernCDPRegistry() override { return overrides_.enableModernCDPRegistry.value_or( ReactNativeFeatureFlagsDefaults::inspectorEnableModernCDPRegistry()); diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.h b/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.h index cbf8e779b76..915ba597d99 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.h +++ b/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.h @@ -19,7 +19,6 @@ namespace facebook::react::jsinspector_modern { struct InspectorFlagOverrides { // NOTE: Keep these entries in sync with ReactNativeFeatureFlagsOverrides in // the implementation file. - std::optional enableCxxInspectorPackagerConnection; std::optional enableModernCDPRegistry; }; diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp index d7df428cd27..72fe7b38b2b 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<71ea09d31186aea96ff207b1015f155e>> + * @generated SignedSource<<4445b86f8e66d2ec2b1cdbd2d99a551e>> */ /** @@ -73,10 +73,6 @@ bool ReactNativeFeatureFlags::forceBatchingMountItemsOnAndroid() { return getAccessor().forceBatchingMountItemsOnAndroid(); } -bool ReactNativeFeatureFlags::inspectorEnableCxxInspectorPackagerConnection() { - return getAccessor().inspectorEnableCxxInspectorPackagerConnection(); -} - bool ReactNativeFeatureFlags::inspectorEnableModernCDPRegistry() { return getAccessor().inspectorEnableModernCDPRegistry(); } diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h index eca725c01bc..bdd590639b9 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<> + * @generated SignedSource<> */ /** @@ -102,11 +102,6 @@ class ReactNativeFeatureFlags { */ RN_EXPORT static bool forceBatchingMountItemsOnAndroid(); - /** - * Flag determining if the C++ implementation of InspectorPackagerConnection should be used instead of the per-platform one. This flag is global and should not be changed across React Host lifetimes. - */ - RN_EXPORT static bool inspectorEnableCxxInspectorPackagerConnection(); - /** * Flag determining if the modern CDP backend should be enabled. This flag is global and should not be changed across React Host lifetimes. */ diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.cpp b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.cpp index 6fabfbab220..ca6e5c0ca6a 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.cpp +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.cpp @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<2e874e6368f85709ecbb4c1e086ae7a9>> + * @generated SignedSource<> */ /** @@ -263,24 +263,6 @@ bool ReactNativeFeatureFlagsAccessor::forceBatchingMountItemsOnAndroid() { return flagValue.value(); } -bool ReactNativeFeatureFlagsAccessor::inspectorEnableCxxInspectorPackagerConnection() { - auto flagValue = inspectorEnableCxxInspectorPackagerConnection_.load(); - - if (!flagValue.has_value()) { - // This block is not exclusive but it is not necessary. - // If multiple threads try to initialize the feature flag, we would only - // be accessing the provider multiple times but the end state of this - // instance and the returned flag value would be the same. - - markFlagAsAccessed(13, "inspectorEnableCxxInspectorPackagerConnection"); - - flagValue = currentProvider_->inspectorEnableCxxInspectorPackagerConnection(); - inspectorEnableCxxInspectorPackagerConnection_ = flagValue; - } - - return flagValue.value(); -} - bool ReactNativeFeatureFlagsAccessor::inspectorEnableModernCDPRegistry() { auto flagValue = inspectorEnableModernCDPRegistry_.load(); @@ -290,7 +272,7 @@ bool ReactNativeFeatureFlagsAccessor::inspectorEnableModernCDPRegistry() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(14, "inspectorEnableModernCDPRegistry"); + markFlagAsAccessed(13, "inspectorEnableModernCDPRegistry"); flagValue = currentProvider_->inspectorEnableModernCDPRegistry(); inspectorEnableModernCDPRegistry_ = flagValue; @@ -308,7 +290,7 @@ bool ReactNativeFeatureFlagsAccessor::lazyAnimationCallbacks() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(15, "lazyAnimationCallbacks"); + markFlagAsAccessed(14, "lazyAnimationCallbacks"); flagValue = currentProvider_->lazyAnimationCallbacks(); lazyAnimationCallbacks_ = flagValue; @@ -326,7 +308,7 @@ bool ReactNativeFeatureFlagsAccessor::preventDoubleTextMeasure() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(16, "preventDoubleTextMeasure"); + markFlagAsAccessed(15, "preventDoubleTextMeasure"); flagValue = currentProvider_->preventDoubleTextMeasure(); preventDoubleTextMeasure_ = flagValue; @@ -344,7 +326,7 @@ bool ReactNativeFeatureFlagsAccessor::setAndroidLayoutDirection() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(17, "setAndroidLayoutDirection"); + markFlagAsAccessed(16, "setAndroidLayoutDirection"); flagValue = currentProvider_->setAndroidLayoutDirection(); setAndroidLayoutDirection_ = flagValue; @@ -362,7 +344,7 @@ bool ReactNativeFeatureFlagsAccessor::useModernRuntimeScheduler() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(18, "useModernRuntimeScheduler"); + markFlagAsAccessed(17, "useModernRuntimeScheduler"); flagValue = currentProvider_->useModernRuntimeScheduler(); useModernRuntimeScheduler_ = flagValue; @@ -380,7 +362,7 @@ bool ReactNativeFeatureFlagsAccessor::useNativeViewConfigsInBridgelessMode() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(19, "useNativeViewConfigsInBridgelessMode"); + markFlagAsAccessed(18, "useNativeViewConfigsInBridgelessMode"); flagValue = currentProvider_->useNativeViewConfigsInBridgelessMode(); useNativeViewConfigsInBridgelessMode_ = flagValue; @@ -398,7 +380,7 @@ bool ReactNativeFeatureFlagsAccessor::useStateAlignmentMechanism() { // be accessing the provider multiple times but the end state of this // instance and the returned flag value would be the same. - markFlagAsAccessed(20, "useStateAlignmentMechanism"); + markFlagAsAccessed(19, "useStateAlignmentMechanism"); flagValue = currentProvider_->useStateAlignmentMechanism(); useStateAlignmentMechanism_ = flagValue; diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.h index 3c2daeb6ad5..30821ac9028 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.h @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<7d1c4c90d5e1feb0015376f20943ee51>> + * @generated SignedSource<> */ /** @@ -44,7 +44,6 @@ class ReactNativeFeatureFlagsAccessor { bool enableUIConsistency(); bool fixStoppedSurfaceRemoveDeleteTreeUIFrameCallbackLeak(); bool forceBatchingMountItemsOnAndroid(); - bool inspectorEnableCxxInspectorPackagerConnection(); bool inspectorEnableModernCDPRegistry(); bool lazyAnimationCallbacks(); bool preventDoubleTextMeasure(); @@ -62,7 +61,7 @@ class ReactNativeFeatureFlagsAccessor { std::unique_ptr currentProvider_; bool wasOverridden_; - std::array, 21> accessedFeatureFlags_; + std::array, 20> accessedFeatureFlags_; std::atomic> commonTestFlag_; std::atomic> allowCollapsableChildren_; @@ -77,7 +76,6 @@ class ReactNativeFeatureFlagsAccessor { std::atomic> enableUIConsistency_; std::atomic> fixStoppedSurfaceRemoveDeleteTreeUIFrameCallbackLeak_; std::atomic> forceBatchingMountItemsOnAndroid_; - std::atomic> inspectorEnableCxxInspectorPackagerConnection_; std::atomic> inspectorEnableModernCDPRegistry_; std::atomic> lazyAnimationCallbacks_; std::atomic> preventDoubleTextMeasure_; diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h index 8bde1e420dc..79048e264b2 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<54a1827a45d7dd15b5e8a26d49ad6d30>> + * @generated SignedSource<> */ /** @@ -79,10 +79,6 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider { return false; } - bool inspectorEnableCxxInspectorPackagerConnection() override { - return false; - } - bool inspectorEnableModernCDPRegistry() override { return false; } diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h index 319de4e0794..68bf1e995a5 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<> + * @generated SignedSource<> */ /** @@ -38,7 +38,6 @@ class ReactNativeFeatureFlagsProvider { virtual bool enableUIConsistency() = 0; virtual bool fixStoppedSurfaceRemoveDeleteTreeUIFrameCallbackLeak() = 0; virtual bool forceBatchingMountItemsOnAndroid() = 0; - virtual bool inspectorEnableCxxInspectorPackagerConnection() = 0; virtual bool inspectorEnableModernCDPRegistry() = 0; virtual bool lazyAnimationCallbacks() = 0; virtual bool preventDoubleTextMeasure() = 0; diff --git a/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp b/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp index 29091f3cbde..581db9be73c 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<1fdca69483db9e0fc9f9ab7a2cd9ff85>> + * @generated SignedSource<<8b16e85f68631df0af57e9dc3366c022>> */ /** @@ -102,11 +102,6 @@ bool NativeReactNativeFeatureFlags::forceBatchingMountItemsOnAndroid( return ReactNativeFeatureFlags::forceBatchingMountItemsOnAndroid(); } -bool NativeReactNativeFeatureFlags::inspectorEnableCxxInspectorPackagerConnection( - jsi::Runtime& /*runtime*/) { - return ReactNativeFeatureFlags::inspectorEnableCxxInspectorPackagerConnection(); -} - bool NativeReactNativeFeatureFlags::inspectorEnableModernCDPRegistry( jsi::Runtime& /*runtime*/) { return ReactNativeFeatureFlags::inspectorEnableModernCDPRegistry(); diff --git a/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h b/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h index 815380f8988..2d8c84db6c3 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h +++ b/packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<9653b7699416f1702ba2f5e8b8f6da93>> + * @generated SignedSource<> */ /** @@ -61,8 +61,6 @@ class NativeReactNativeFeatureFlags bool forceBatchingMountItemsOnAndroid(jsi::Runtime& runtime); - bool inspectorEnableCxxInspectorPackagerConnection(jsi::Runtime& runtime); - bool inspectorEnableModernCDPRegistry(jsi::Runtime& runtime); bool lazyAnimationCallbacks(jsi::Runtime& runtime); diff --git a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js index 5d1b145c398..d52a49c6c17 100644 --- a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js +++ b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js @@ -98,11 +98,6 @@ const definitions: FeatureFlagDefinitions = { description: 'Forces the mounting layer on Android to always batch mount items instead of dispatching them immediately. This might fix some crashes related to synchronous state updates, where some views dispatch state updates during mount.', }, - inspectorEnableCxxInspectorPackagerConnection: { - defaultValue: false, - description: - 'Flag determining if the C++ implementation of InspectorPackagerConnection should be used instead of the per-platform one. This flag is global and should not be changed across React Host lifetimes.', - }, inspectorEnableModernCDPRegistry: { defaultValue: false, description: diff --git a/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js b/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js index 15c717c96d8..1b27e6b2c45 100644 --- a/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js +++ b/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<63e7a8952026600cb58367e9c70fb68d>> + * @generated SignedSource<<6b04d73d4a2525022a2e81334656cc86>> * @flow strict-local */ @@ -53,7 +53,6 @@ export type ReactNativeFeatureFlags = { enableUIConsistency: Getter, fixStoppedSurfaceRemoveDeleteTreeUIFrameCallbackLeak: Getter, forceBatchingMountItemsOnAndroid: Getter, - inspectorEnableCxxInspectorPackagerConnection: Getter, inspectorEnableModernCDPRegistry: Getter, lazyAnimationCallbacks: Getter, preventDoubleTextMeasure: Getter, @@ -155,10 +154,6 @@ export const fixStoppedSurfaceRemoveDeleteTreeUIFrameCallbackLeak: Getter = createNativeFlagGetter('forceBatchingMountItemsOnAndroid', false); -/** - * Flag determining if the C++ implementation of InspectorPackagerConnection should be used instead of the per-platform one. This flag is global and should not be changed across React Host lifetimes. - */ -export const inspectorEnableCxxInspectorPackagerConnection: Getter = createNativeFlagGetter('inspectorEnableCxxInspectorPackagerConnection', false); /** * Flag determining if the modern CDP backend should be enabled. This flag is global and should not be changed across React Host lifetimes. */ diff --git a/packages/react-native/src/private/featureflags/specs/NativeReactNativeFeatureFlags.js b/packages/react-native/src/private/featureflags/specs/NativeReactNativeFeatureFlags.js index f1b75954e54..3ce0ea77f00 100644 --- a/packages/react-native/src/private/featureflags/specs/NativeReactNativeFeatureFlags.js +++ b/packages/react-native/src/private/featureflags/specs/NativeReactNativeFeatureFlags.js @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<> + * @generated SignedSource<<148aa848925eead93c7197236c51eaba>> * @flow strict-local */ @@ -36,7 +36,6 @@ export interface Spec extends TurboModule { +enableUIConsistency?: () => boolean; +fixStoppedSurfaceRemoveDeleteTreeUIFrameCallbackLeak?: () => boolean; +forceBatchingMountItemsOnAndroid?: () => boolean; - +inspectorEnableCxxInspectorPackagerConnection?: () => boolean; +inspectorEnableModernCDPRegistry?: () => boolean; +lazyAnimationCallbacks?: () => boolean; +preventDoubleTextMeasure?: () => boolean;