From ca85a536c63ba6fd03d2c91a4d9cf2d15aa3157d Mon Sep 17 00:00:00 2001 From: Dan Zimmerman Date: Wed, 25 Oct 2017 08:05:31 -0700 Subject: [PATCH] Remove experimental shouldBridgeInitializeNativeModulesSynchronously: Differential Revision: D6124035 fbshipit-source-id: 540b8bfc955bf48e9ca33ed97807177ac740059e --- React/Base/RCTBatchedBridge.mm | 2 -- React/Base/RCTBridgeDelegate.h | 10 ---------- React/CxxBridge/RCTCxxBridge.mm | 2 -- 3 files changed, 14 deletions(-) diff --git a/React/Base/RCTBatchedBridge.mm b/React/Base/RCTBatchedBridge.mm index 661d4db630f..0b937525241 100644 --- a/React/Base/RCTBatchedBridge.mm +++ b/React/Base/RCTBatchedBridge.mm @@ -410,8 +410,6 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithBundleURL:(__unused NSURL *)bundleUR // We better be on the right thread too. RCTAssertMainQueue(); initializeImmediately = YES; - } else if ([self.delegate respondsToSelector:@selector(shouldBridgeInitializeNativeModulesSynchronously:)]) { - initializeImmediately = [self.delegate shouldBridgeInitializeNativeModulesSynchronously:self]; } // Set up modules that require main thread init or constants export diff --git a/React/Base/RCTBridgeDelegate.h b/React/Base/RCTBridgeDelegate.h index 2ec89fd57ef..7c56c0c894b 100644 --- a/React/Base/RCTBridgeDelegate.h +++ b/React/Base/RCTBridgeDelegate.h @@ -63,16 +63,6 @@ */ - (BOOL)shouldBridgeLoadJavaScriptSynchronously:(RCTBridge *)bridge; -/** - * When initializing native modules that require main thread initialization, the bridge - * will default to dispatch module creation blocks asynchrously. If we're blockingly - * waiting on the main thread to finish bridge creation on the main thread, this will - * deadlock. Override this method to initialize modules synchronously instead. - * - * @experimental - */ -- (BOOL)shouldBridgeInitializeNativeModulesSynchronously:(RCTBridge *)bridge; - /** * Configure whether the JSCExecutor created should use the system JSC API or * alternative hooks provided. When returning YES from this method, you must have diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm index cb20a01c331..80d23102309 100644 --- a/React/CxxBridge/RCTCxxBridge.mm +++ b/React/CxxBridge/RCTCxxBridge.mm @@ -725,8 +725,6 @@ struct RCTInstanceCallback : public InstanceCallback { // We better be on the right thread too. RCTAssertMainQueue(); initializeImmediately = YES; - } else if ([self.delegate respondsToSelector:@selector(shouldBridgeInitializeNativeModulesSynchronously:)]) { - initializeImmediately = [self.delegate shouldBridgeInitializeNativeModulesSynchronously:self]; } // Set up modules that require main thread init or constants export