Skip to content

Commit 4c998fd

Browse files
RSNarafacebook-github-bot
RSNara
authored and
facebook-github-bot
committed
Rename JSCallInvoker{,Holder} to CallInvoker{,Holder}
Summary: ## Motivation The concept behind JSCallInvoker doesn't necessarily have to apply only to the JS thread. On Android, we need to re-use this abstraction to allow execution of async method calls on the NativeModules thread. Reviewed By: PeteTheHeat Differential Revision: D17377313 fbshipit-source-id: 3d9075cbfce0b908d800a366947cfd16a3013d1c
1 parent 60b57ba commit 4c998fd

File tree

67 files changed

+279
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+279
-284
lines changed

‎Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm

Lines changed: 50 additions & 50 deletions
Large diffs are not rendered by default.

‎Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h

Lines changed: 50 additions & 50 deletions
Large diffs are not rendered by default.

‎RNTester/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ PODS:
226226
- React-Core/RCTTextHeaders (= 1000.0.0)
227227
- React-RCTVibration (1000.0.0):
228228
- React-Core/RCTVibrationHeaders (= 1000.0.0)
229-
- ReactCommon/jscallinvoker (1000.0.0):
229+
- ReactCommon/callinvoker (1000.0.0):
230230
- DoubleConversion
231231
- Folly (= 2018.10.22.00)
232232
- glog
@@ -238,15 +238,15 @@ PODS:
238238
- React-Core (= 1000.0.0)
239239
- React-cxxreact (= 1000.0.0)
240240
- React-jsi (= 1000.0.0)
241-
- ReactCommon/jscallinvoker (= 1000.0.0)
241+
- ReactCommon/callinvoker (= 1000.0.0)
242242
- ReactCommon/turbomodule/samples (1000.0.0):
243243
- DoubleConversion
244244
- Folly (= 2018.10.22.00)
245245
- glog
246246
- React-Core (= 1000.0.0)
247247
- React-cxxreact (= 1000.0.0)
248248
- React-jsi (= 1000.0.0)
249-
- ReactCommon/jscallinvoker (= 1000.0.0)
249+
- ReactCommon/callinvoker (= 1000.0.0)
250250
- ReactCommon/turbomodule/core (= 1000.0.0)
251251
- Yoga (1.14.0)
252252

@@ -279,7 +279,7 @@ DEPENDENCIES:
279279
- React-RCTTest (from `RCTTest`)
280280
- React-RCTText (from `../Libraries/Text`)
281281
- React-RCTVibration (from `../Libraries/Vibration`)
282-
- ReactCommon/jscallinvoker (from `../ReactCommon`)
282+
- ReactCommon/callinvoker (from `../ReactCommon`)
283283
- ReactCommon/turbomodule/core (from `../ReactCommon`)
284284
- ReactCommon/turbomodule/samples (from `../ReactCommon`)
285285
- Yoga (from `../ReactCommon/yoga`)
@@ -374,7 +374,7 @@ SPEC CHECKSUMS:
374374
React-RCTTest: 73df09ec226fcad6e7e058a313e5dd16cccf86a8
375375
React-RCTText: 9078167d3bc011162326f2d8ef4dd580ec1eca17
376376
React-RCTVibration: 63c20d89204937ff8c7bbc1e712383347e6fbd90
377-
ReactCommon: 63d1a6355d5810a21a61efda9ac93804571a1b8b
377+
ReactCommon: 9d212865526209dc2d01be40340c8d27b53e6bea
378378
Yoga: d88d8b51ee5b247f43211e2edf272438df1b484f
379379

380380
PODFILE CHECKSUM: 060903e270072f1e192b064848e6c34528af1c87

‎RNTester/RNTester/AppDelegate.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ - (Class)getModuleClassFromName:(const char *)name
129129
}
130130

131131
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
132-
jsInvoker:(std::shared_ptr<facebook::react::JSCallInvoker>)jsInvoker
132+
jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
133133
{
134134
return facebook::react::RNTesterTurboModuleProvider(name, jsInvoker);
135135
}
136136

137137
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
138138
instance:(id<RCTTurboModule>)instance
139-
jsInvoker:(std::shared_ptr<facebook::react::JSCallInvoker>)jsInvoker
139+
jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
140140
{
141141
return facebook::react::RNTesterTurboModuleProvider(name, instance, jsInvoker);
142142
}

‎RNTester/RNTester/RNTesterTurboModuleProvider.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ Class RNTesterTurboModuleClassProvider(const char *name);
1919
/**
2020
* Provide a pure C++ instance of a TurboModule, specific to this app.
2121
*/
22-
std::shared_ptr<TurboModule> RNTesterTurboModuleProvider(const std::string &name, std::shared_ptr<JSCallInvoker> jsInvoker);
22+
std::shared_ptr<TurboModule> RNTesterTurboModuleProvider(const std::string &name, std::shared_ptr<CallInvoker> jsInvoker);
2323

2424
/**
2525
* Provide an instance of a ObjCTurboModule, given the ObjC instance, specific to this app.
2626
*/
2727
std::shared_ptr<TurboModule> RNTesterTurboModuleProvider(const std::string &name,
2828
id<RCTTurboModule> instance,
29-
std::shared_ptr<JSCallInvoker> jsInvoker);
29+
std::shared_ptr<CallInvoker> jsInvoker);
3030

3131
} // namespace react
3232
} // namespace facebook

‎RNTester/RNTester/RNTesterTurboModuleProvider.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Class RNTesterTurboModuleClassProvider(const char *name) {
2121
return RCTCoreModulesClassProvider(name);
2222
}
2323

24-
std::shared_ptr<TurboModule> RNTesterTurboModuleProvider(const std::string &name, std::shared_ptr<JSCallInvoker> jsInvoker) {
24+
std::shared_ptr<TurboModule> RNTesterTurboModuleProvider(const std::string &name, std::shared_ptr<CallInvoker> jsInvoker) {
2525
if (name == "SampleTurboCxxModule") {
2626
return std::make_shared<SampleTurboCxxModule>(jsInvoker);
2727
}
@@ -31,7 +31,7 @@ Class RNTesterTurboModuleClassProvider(const char *name) {
3131

3232
std::shared_ptr<TurboModule> RNTesterTurboModuleProvider(const std::string &name,
3333
id<RCTTurboModule> instance,
34-
std::shared_ptr<JSCallInvoker> jsInvoker) {
34+
std::shared_ptr<CallInvoker> jsInvoker) {
3535
if (name == "SampleTurboModule") {
3636
return std::make_shared<NativeSampleTurboModuleSpecJSI>(instance, jsInvoker);
3737
}

‎React/CoreModules/RCTAccessibilityManager.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ static void setMultipliers(NSMutableDictionary<NSString *, NSNumber *> *multipli
334334

335335

336336
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModuleWithJsInvoker:
337-
(std::shared_ptr<facebook::react::JSCallInvoker>)jsInvoker
337+
(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
338338
{
339339
return std::make_shared<facebook::react::NativeAccessibilityManagerSpecJSI>(self, jsInvoker);
340340
}

‎React/CoreModules/RCTAppearance.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ - (dispatch_queue_t)methodQueue
5757
return dispatch_get_main_queue();
5858
}
5959

60-
- (std::shared_ptr<TurboModule>)getTurboModuleWithJsInvoker:(std::shared_ptr<JSCallInvoker>)jsInvoker
60+
- (std::shared_ptr<TurboModule>)getTurboModuleWithJsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
6161
{
6262
return std::make_shared<NativeAppearanceSpecJSI>(self, jsInvoker);
6363
}

‎React/CoreModules/RCTDeviceInfo.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ - (void)_interfaceFrameDidChange
212212

213213
#endif // TARGET_OS_TV
214214

215-
- (std::shared_ptr<TurboModule>)getTurboModuleWithJsInvoker:(std::shared_ptr<JSCallInvoker>)jsInvoker
215+
- (std::shared_ptr<TurboModule>)getTurboModuleWithJsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
216216
{
217217
return std::make_shared<NativeDeviceInfoSpecJSI>(self, jsInvoker);
218218
}

‎React/CoreModules/RCTExceptionsManager.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ - (instancetype)initWithDelegate:(id<RCTExceptionsManagerDelegate>)delegate
122122
}
123123

124124
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModuleWithJsInvoker:
125-
(std::shared_ptr<facebook::react::JSCallInvoker>)jsInvoker
125+
(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
126126
{
127127
return std::make_shared<facebook::react::NativeExceptionsManagerSpecJSI>(self, jsInvoker);
128128
}

0 commit comments

Comments
 (0)