Skip to content

Commit 4cbcb7a

Browse files
sammy-SCfacebook-github-bot
authored andcommitted
Abandon mc react_fabric.enable_event_emitter_wrapper_raw_pointer
Summary: changelog: [internal] Remove gating. Reviewed By: philIip Differential Revision: D33944220 fbshipit-source-id: bba076a2166f8d676119d5c069a3894e3d547285
1 parent 491c423 commit 4cbcb7a

File tree

6 files changed

+5
-39
lines changed

6 files changed

+5
-39
lines changed

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@ Binding::getInspectorDataForInstance(
6060
}
6161

6262
EventEmitterWrapper *cEventEmitter = cthis(eventEmitterWrapper);
63-
InspectorData data = scheduler->getInspectorDataForInstance(
64-
enableEventEmitterRawPointer_ ? *cEventEmitter->eventEmitterPointer
65-
: *cEventEmitter->eventEmitter);
63+
InspectorData data =
64+
scheduler->getInspectorDataForInstance(*cEventEmitter->eventEmitter);
6665

6766
folly::dynamic result = folly::dynamic::object;
6867
result["fileName"] = data.fileName;
@@ -369,9 +368,6 @@ void Binding::installFabricUIManager(
369368
disableRevisionCheckForPreallocation_ =
370369
config->getBool("react_fabric:disable_revision_check_for_preallocation");
371370

372-
enableEventEmitterRawPointer_ =
373-
config->getBool("react_fabric:enable_event_emitter_wrapper_raw_pointer");
374-
375371
if (enableFabricLogs_) {
376372
LOG(WARNING) << "Binding::installFabricUIManager() was called (address: "
377373
<< this << ").";

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ class Binding : public jni::HybridClass<Binding>,
155155
bool disablePreallocateViews_{false};
156156
bool enableFabricLogs_{false};
157157
bool disableRevisionCheckForPreallocation_{false};
158-
bool enableEventEmitterRawPointer_{false};
159158
bool dispatchPreallocationInBackground_{false};
160159
};
161160

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@ void EventEmitterWrapper::invokeEvent(
2222
std::string const &eventName,
2323
NativeMap *payload,
2424
int category) {
25-
if (eventEmitterPointer) {
26-
eventEmitterPointer->dispatchEvent(
27-
eventName,
28-
payload->consume(),
29-
EventPriority::AsynchronousBatched,
30-
static_cast<RawEvent::Category>(category));
31-
return;
32-
}
33-
3425
// It is marginal, but possible for this to be constructed without a valid
3526
// EventEmitter. In those cases, make sure we noop/blackhole events instead of
3627
// crashing.
@@ -47,10 +38,6 @@ void EventEmitterWrapper::invokeUniqueEvent(
4738
std::string const &eventName,
4839
NativeMap *payload,
4940
int customCoalesceKey) {
50-
if (eventEmitterPointer) {
51-
eventEmitterPointer->dispatchUniqueEvent(eventName, payload->consume());
52-
return;
53-
}
5441
// TODO: customCoalesceKey currently unused
5542
// It is marginal, but possible for this to be constructed without a valid
5643
// EventEmitter. In those cases, make sure we noop/blackhole events instead of

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class EventEmitterWrapper : public jni::HybridClass<EventEmitterWrapper> {
2424
static void registerNatives();
2525

2626
SharedEventEmitter eventEmitter;
27-
EventEmitter const *eventEmitterPointer;
2827

2928
void
3029
invokeEvent(std::string const &eventName, NativeMap *params, int category);

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.cpp

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -545,11 +545,7 @@ void FabricMountingManager::executeMount(
545545
mountItem.newChildShadowView.eventEmitter;
546546
auto javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
547547
EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
548-
if (enableEventEmitterRawPointer_) {
549-
cEventEmitter->eventEmitterPointer = eventEmitter.get();
550-
} else {
551-
cEventEmitter->eventEmitter = eventEmitter;
552-
}
548+
cEventEmitter->eventEmitter = eventEmitter;
553549
temp[0] = mountItem.newChildShadowView.tag;
554550
temp[1] = isLayoutable;
555551
env->SetIntArrayRegion(intBufferArray, intBufferPosition, 2, temp);
@@ -729,11 +725,7 @@ void FabricMountingManager::executeMount(
729725
// Do not hold a reference to javaEventEmitter from the C++ side.
730726
auto javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
731727
EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
732-
if (enableEventEmitterRawPointer_) {
733-
cEventEmitter->eventEmitterPointer = eventEmitter.get();
734-
} else {
735-
cEventEmitter->eventEmitter = eventEmitter;
736-
}
728+
cEventEmitter->eventEmitter = eventEmitter;
737729

738730
(*objBufferArray)[objBufferPosition++] = javaEventEmitter.get();
739731
}
@@ -830,11 +822,7 @@ void FabricMountingManager::preallocateShadowView(
830822
if (eventEmitter != nullptr) {
831823
javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
832824
EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
833-
if (enableEventEmitterRawPointer_) {
834-
cEventEmitter->eventEmitterPointer = eventEmitter.get();
835-
} else {
836-
cEventEmitter->eventEmitter = eventEmitter;
837-
}
825+
cEventEmitter->eventEmitter = eventEmitter;
838826
}
839827
}
840828

@@ -947,8 +935,6 @@ FabricMountingManager::FabricMountingManager(
947935
: javaUIManager_(javaUIManager) {
948936
enableEarlyEventEmitterUpdate_ =
949937
config->getBool("react_fabric:enable_early_event_emitter_update");
950-
enableEventEmitterRawPointer_ =
951-
config->getBool("react_fabric:enable_event_emitter_wrapper_raw_pointer");
952938
disablePreallocateViews_ =
953939
config->getBool("react_fabric:disabled_view_preallocation_android");
954940
disableRevisionCheckForPreallocation_ =

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class FabricMountingManager {
7171
butter::map<SurfaceId, butter::set<Tag>> allocatedViewRegistry_{};
7272
std::recursive_mutex allocatedViewsMutex_;
7373

74-
bool enableEventEmitterRawPointer_{false};
7574
bool enableEarlyEventEmitterUpdate_{false};
7675
bool disablePreallocateViews_{false};
7776
bool disableRevisionCheckForPreallocation_{false};

0 commit comments

Comments
 (0)