|
13 | 13 | import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE_REGISTRY_END; |
14 | 14 | import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE_REGISTRY_START; |
15 | 15 | import static com.facebook.react.bridge.ReactMarkerConstants.CHANGE_THREAD_PRIORITY; |
16 | | -import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_CATALYST_INSTANCE_END; |
17 | | -import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_CATALYST_INSTANCE_START; |
18 | | -import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_REACT_CONTEXT_START; |
19 | 16 | import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_VIEW_MANAGERS_END; |
20 | 17 | import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_VIEW_MANAGERS_START; |
21 | 18 | import static com.facebook.react.bridge.ReactMarkerConstants.PRE_SETUP_REACT_CONTEXT_END; |
|
49 | 46 | import com.facebook.infer.annotation.ThreadConfined; |
50 | 47 | import com.facebook.infer.annotation.ThreadSafe; |
51 | 48 | import com.facebook.react.bridge.Arguments; |
52 | | -import com.facebook.react.bridge.BridgeReactContext; |
53 | 49 | import com.facebook.react.bridge.CatalystInstance; |
54 | | -import com.facebook.react.bridge.CatalystInstanceImpl; |
55 | 50 | import com.facebook.react.bridge.JSBundleLoader; |
56 | 51 | import com.facebook.react.bridge.JSExceptionHandler; |
57 | 52 | import com.facebook.react.bridge.JavaScriptExecutor; |
|
67 | 62 | import com.facebook.react.bridge.UIManagerProvider; |
68 | 63 | import com.facebook.react.bridge.UiThreadUtil; |
69 | 64 | import com.facebook.react.bridge.WritableNativeMap; |
70 | | -import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec; |
71 | 65 | import com.facebook.react.common.LifecycleState; |
72 | 66 | import com.facebook.react.common.ReactConstants; |
73 | 67 | import com.facebook.react.common.SurfaceDelegateFactory; |
|
86 | 80 | import com.facebook.react.internal.AndroidChoreographerProvider; |
87 | 81 | import com.facebook.react.internal.ChoreographerProvider; |
88 | 82 | import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags; |
89 | | -import com.facebook.react.internal.turbomodule.core.TurboModuleManager; |
90 | | -import com.facebook.react.internal.turbomodule.core.TurboModuleManagerDelegate; |
91 | 83 | import com.facebook.react.modules.appearance.AppearanceModule; |
92 | 84 | import com.facebook.react.modules.appregistry.AppRegistry; |
93 | 85 | import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; |
@@ -1395,88 +1387,10 @@ private void tearDownReactContext(ReactContext reactContext) { |
1395 | 1387 | */ |
1396 | 1388 | private ReactApplicationContext createReactContext( |
1397 | 1389 | JavaScriptExecutor jsExecutor, JSBundleLoader jsBundleLoader) { |
1398 | | - |
1399 | | - FLog.d(ReactConstants.TAG, "ReactInstanceManager.createReactContext()"); |
1400 | | - ReactMarker.logMarker(CREATE_REACT_CONTEXT_START, jsExecutor.getName()); |
1401 | | - |
1402 | | - final BridgeReactContext reactContext = new BridgeReactContext(mApplicationContext); |
1403 | | - |
1404 | | - JSExceptionHandler exceptionHandler = |
1405 | | - mJSExceptionHandler != null ? mJSExceptionHandler : mDevSupportManager; |
1406 | | - reactContext.setJSExceptionHandler(exceptionHandler); |
1407 | | - |
1408 | | - NativeModuleRegistry nativeModuleRegistry = processPackages(reactContext, mPackages); |
1409 | | - |
1410 | | - CatalystInstanceImpl.Builder catalystInstanceBuilder = |
1411 | | - new CatalystInstanceImpl.Builder() |
1412 | | - .setReactQueueConfigurationSpec(ReactQueueConfigurationSpec.createDefault()) |
1413 | | - .setJSExecutor(jsExecutor) |
1414 | | - .setRegistry(nativeModuleRegistry) |
1415 | | - .setJSBundleLoader(jsBundleLoader) |
1416 | | - .setJSExceptionHandler(exceptionHandler); |
1417 | | - |
1418 | | - ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_START); |
1419 | | - // CREATE_CATALYST_INSTANCE_END is in JSCExecutor.cpp |
1420 | | - Systrace.beginSection(TRACE_TAG_REACT, "createCatalystInstance"); |
1421 | | - final CatalystInstance catalystInstance; |
1422 | | - try { |
1423 | | - catalystInstance = catalystInstanceBuilder.build(); |
1424 | | - } finally { |
1425 | | - Systrace.endSection(TRACE_TAG_REACT); |
1426 | | - ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_END); |
1427 | | - } |
1428 | | - |
1429 | | - reactContext.initializeWithInstance(catalystInstance); |
1430 | | - |
1431 | | - // On Old Architecture, we need to initialize the Native Runtime Scheduler so that |
1432 | | - // the `nativeRuntimeScheduler` object is registered on JS. |
1433 | | - // On New Architecture, this is normally triggered by instantiate a TurboModuleManager. |
1434 | | - // Here we invoke getRuntimeScheduler() to trigger the creation of it regardless of the |
1435 | | - // architecture so it will always be there. |
1436 | | - catalystInstance.getRuntimeScheduler(); |
1437 | | - |
1438 | | - if (ReactNativeNewArchitectureFeatureFlags.useTurboModules() && mTMMDelegateBuilder != null) { |
1439 | | - TurboModuleManagerDelegate tmmDelegate = |
1440 | | - mTMMDelegateBuilder |
1441 | | - .setPackages(mPackages) |
1442 | | - .setReactApplicationContext(reactContext) |
1443 | | - .build(); |
1444 | | - |
1445 | | - TurboModuleManager turboModuleManager = |
1446 | | - new TurboModuleManager( |
1447 | | - catalystInstance.getRuntimeExecutor(), |
1448 | | - tmmDelegate, |
1449 | | - catalystInstance.getJSCallInvokerHolder(), |
1450 | | - catalystInstance.getNativeMethodCallInvokerHolder()); |
1451 | | - |
1452 | | - catalystInstance.setTurboModuleRegistry(turboModuleManager); |
1453 | | - |
1454 | | - // Eagerly initialize TurboModules |
1455 | | - for (String moduleName : turboModuleManager.getEagerInitModuleNames()) { |
1456 | | - turboModuleManager.getModule(moduleName); |
1457 | | - } |
1458 | | - } |
1459 | | - |
1460 | | - if (mUIManagerProvider != null) { |
1461 | | - UIManager uiManager = mUIManagerProvider.createUIManager(reactContext); |
1462 | | - if (uiManager != null) { |
1463 | | - catalystInstance.setFabricUIManager(uiManager); |
1464 | | - |
1465 | | - // Initialize the UIManager |
1466 | | - uiManager.initialize(); |
1467 | | - catalystInstance.setFabricUIManager(uiManager); |
1468 | | - } |
1469 | | - } |
1470 | | - if (BuildConfig.ENABLE_PERFETTO || Systrace.isTracing(TRACE_TAG_REACT)) { |
1471 | | - catalystInstance.setGlobalVariable("__RCTProfileIsProfiling", "true"); |
1472 | | - } |
1473 | | - |
1474 | | - ReactMarker.logMarker(ReactMarkerConstants.PRE_RUN_JS_BUNDLE_START); |
1475 | | - Systrace.beginSection(TRACE_TAG_REACT, "runJSBundle"); |
1476 | | - catalystInstance.runJSBundle(); |
1477 | | - Systrace.endSection(TRACE_TAG_REACT); |
1478 | | - |
1479 | | - return reactContext; |
| 1390 | + // CatalystInstanceImpl has been removed as part of the Legacy Architecture cleanup. |
| 1391 | + throw new UnsupportedOperationException( |
| 1392 | + "ReactInstanceManager.createReactContext is unsupported. CatalystInstanceImpl has been" |
| 1393 | + + " removed."); |
1480 | 1394 | } |
1481 | 1395 |
|
1482 | 1396 | private NativeModuleRegistry processPackages( |
|
0 commit comments