Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Abandon mc react_fabric.enable_event_emitter_wrapper_raw_pointer

Browse Source 
Summary:
changelog: [internal]

Remove gating.

Reviewed By: philIip

Differential Revision: D33944220

fbshipit-source-id: bba076a2166f8d676119d5c069a3894e3d547285
This commit is contained in:
Samuel Susla
2022-02-03 04:50:04 -08:00
committed by Facebook GitHub Bot
parent 491c4231db
commit 4cbcb7a13a
6 changed files with 5 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
+2 -6
View File
@@ -60,9 +60,8 @@ Binding::getInspectorDataForInstance(
}
EventEmitterWrapper *cEventEmitter = cthis(eventEmitterWrapper);
InspectorData data = scheduler->getInspectorDataForInstance(
enableEventEmitterRawPointer_ ? *cEventEmitter->eventEmitterPointer
: *cEventEmitter->eventEmitter);
InspectorData data =
scheduler->getInspectorDataForInstance(*cEventEmitter->eventEmitter);
folly::dynamic result = folly::dynamic::object;
result["fileName"] = data.fileName;
@@ -369,9 +368,6 @@ void Binding::installFabricUIManager(
disableRevisionCheckForPreallocation_ =
config->getBool("react_fabric:disable_revision_check_for_preallocation");
enableEventEmitterRawPointer_ =
config->getBool("react_fabric:enable_event_emitter_wrapper_raw_pointer");
if (enableFabricLogs_) {
LOG(WARNING) << "Binding::installFabricUIManager() was called (address: "
<< this << ").";
ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h
-1
View File
@@ -155,7 +155,6 @@ class Binding : public jni::HybridClass<Binding>,
bool disablePreallocateViews_{false};
bool enableFabricLogs_{false};
bool disableRevisionCheckForPreallocation_{false};
bool enableEventEmitterRawPointer_{false};
bool dispatchPreallocationInBackground_{false};
};
ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp
-13
View File
@@ -22,15 +22,6 @@ void EventEmitterWrapper::invokeEvent(
std::string const &eventName,
NativeMap *payload,
int category) {
if (eventEmitterPointer) {
eventEmitterPointer->dispatchEvent(
eventName,
payload->consume(),
EventPriority::AsynchronousBatched,
static_cast<RawEvent::Category>(category));
return;
}
// It is marginal, but possible for this to be constructed without a valid
// EventEmitter. In those cases, make sure we noop/blackhole events instead of
// crashing.
@@ -47,10 +38,6 @@ void EventEmitterWrapper::invokeUniqueEvent(
std::string const &eventName,
NativeMap *payload,
int customCoalesceKey) {
if (eventEmitterPointer) {
eventEmitterPointer->dispatchUniqueEvent(eventName, payload->consume());
return;
}
// TODO: customCoalesceKey currently unused
// It is marginal, but possible for this to be constructed without a valid
// EventEmitter. In those cases, make sure we noop/blackhole events instead of
ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h
-1
View File
@@ -24,7 +24,6 @@ class EventEmitterWrapper : public jni::HybridClass<EventEmitterWrapper> {
static void registerNatives();
SharedEventEmitter eventEmitter;
EventEmitter const *eventEmitterPointer;
void
invokeEvent(std::string const &eventName, NativeMap *params, int category);
ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.cpp
+3 -17
View File
@@ -545,11 +545,7 @@ void FabricMountingManager::executeMount(
mountItem.newChildShadowView.eventEmitter;
auto javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
if (enableEventEmitterRawPointer_) {
cEventEmitter->eventEmitterPointer = eventEmitter.get();
} else {
cEventEmitter->eventEmitter = eventEmitter;
}
cEventEmitter->eventEmitter = eventEmitter;
temp[0] = mountItem.newChildShadowView.tag;
temp[1] = isLayoutable;
env->SetIntArrayRegion(intBufferArray, intBufferPosition, 2, temp);
@@ -729,11 +725,7 @@ void FabricMountingManager::executeMount(
// Do not hold a reference to javaEventEmitter from the C++ side.
auto javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
if (enableEventEmitterRawPointer_) {
cEventEmitter->eventEmitterPointer = eventEmitter.get();
} else {
cEventEmitter->eventEmitter = eventEmitter;
}
cEventEmitter->eventEmitter = eventEmitter;
(*objBufferArray)[objBufferPosition++] = javaEventEmitter.get();
}
@@ -830,11 +822,7 @@ void FabricMountingManager::preallocateShadowView(
if (eventEmitter != nullptr) {
javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
if (enableEventEmitterRawPointer_) {
cEventEmitter->eventEmitterPointer = eventEmitter.get();
} else {
cEventEmitter->eventEmitter = eventEmitter;
}
cEventEmitter->eventEmitter = eventEmitter;
}
}
@@ -947,8 +935,6 @@ FabricMountingManager::FabricMountingManager(
: javaUIManager_(javaUIManager) {
enableEarlyEventEmitterUpdate_ =
config->getBool("react_fabric:enable_early_event_emitter_update");
enableEventEmitterRawPointer_ =
config->getBool("react_fabric:enable_event_emitter_wrapper_raw_pointer");
disablePreallocateViews_ =
config->getBool("react_fabric:disabled_view_preallocation_android");
disableRevisionCheckForPreallocation_ =
ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.h
-1
View File
@@ -71,7 +71,6 @@ class FabricMountingManager {
butter::map<SurfaceId, butter::set<Tag>> allocatedViewRegistry_{};
std::recursive_mutex allocatedViewsMutex_;
bool enableEventEmitterRawPointer_{false};
bool enableEarlyEventEmitterUpdate_{false};
bool disablePreallocateViews_{false};
bool disableRevisionCheckForPreallocation_{false};