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

Use unique_ptr for FabricMountingManager (#37482)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/37482

Changelog: [Internal]

Reviewed By: veviego

Differential Revision: D45948987

fbshipit-source-id: 5222f44489db7bdb2c44ce31f783fe10d466ba22
This commit is contained in:
Pieter De Baets
2023-05-18 06:49:14 -07:00
committed by Facebook GitHub Bot
parent 0f8b1d2ba3
commit 75d58d4da2
3 changed files with 22 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.cpp
+19 -35
View File
@@ -131,8 +131,7 @@ void Binding::startSurface(
surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
}
auto &mountingManager =
verifyMountingManager("FabricUIManagerBinding::startSurface");
auto *mountingManager = getMountingManager("startSurface");
if (!mountingManager) {
return;
}
@@ -202,8 +201,7 @@ void Binding::startSurfaceWithConstraints(
surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
}
auto &mountingManager = verifyMountingManager(
"FabricUIManagerBinding::startSurfaceWithConstraints");
auto *mountingManager = getMountingManager("startSurfaceWithConstraints");
if (!mountingManager) {
return;
}
@@ -255,8 +253,7 @@ void Binding::stopSurface(jint surfaceId) {
scheduler->unregisterSurface(surfaceHandler);
}
auto &mountingManager =
verifyMountingManager("FabricUIManagerBinding::stopSurface");
auto *mountingManager = getMountingManager("stopSurface");
if (!mountingManager) {
return;
}
@@ -272,8 +269,7 @@ void Binding::registerSurface(SurfaceHandlerBinding *surfaceHandlerBinding) {
}
scheduler->registerSurface(surfaceHandler);
auto &mountingManager =
verifyMountingManager("FabricUIManagerBinding::registerSurface");
auto *mountingManager = getMountingManager("registerSurface");
if (!mountingManager) {
return;
}
@@ -289,8 +285,7 @@ void Binding::unregisterSurface(SurfaceHandlerBinding *surfaceHandlerBinding) {
}
scheduler->unregisterSurface(surfaceHandler);
auto &mountingManager =
verifyMountingManager("FabricUIManagerBinding::unregisterSurface");
auto *mountingManager = getMountingManager("unregisterSurface");
if (!mountingManager) {
return;
}
@@ -373,7 +368,7 @@ void Binding::installFabricUIManager(
auto globalJavaUiManager = make_global(javaUIManager);
mountingManager_ =
std::make_shared<FabricMountingManager>(config, globalJavaUiManager);
std::make_unique<FabricMountingManager>(config, globalJavaUiManager);
ContextContainer::Shared contextContainer =
std::make_shared<ContextContainer>();
@@ -467,19 +462,18 @@ void Binding::uninstallFabricUIManager() {
reactNativeConfig_ = nullptr;
}
const std::shared_ptr<FabricMountingManager> &Binding::verifyMountingManager(
const char *locationHint) {
FabricMountingManager *Binding::getMountingManager(const char *locationHint) {
std::shared_lock lock(installMutex_);
if (!mountingManager_) {
LOG(ERROR) << locationHint << " mounting manager disappeared.";
LOG(ERROR) << "FabricMountingManager::" << locationHint
<< " mounting manager disappeared";
}
return mountingManager_;
return mountingManager_.get();
}
void Binding::schedulerDidFinishTransaction(
const MountingCoordinator::Shared &mountingCoordinator) {
auto &mountingManager =
verifyMountingManager("Binding::schedulerDidFinishTransaction");
auto *mountingManager = getMountingManager("schedulerDidFinishTransaction");
if (!mountingManager) {
return;
}
@@ -498,27 +492,18 @@ void Binding::schedulerDidRequestPreliminaryViewAllocation(
return;
}
preallocateView(surfaceId, shadowNode);
}
void Binding::preallocateView(
SurfaceId surfaceId,
ShadowNode const &shadowNode) {
auto name = std::string(shadowNode.getComponentName());
auto shadowView = ShadowView(shadowNode);
auto &mountingManager = verifyMountingManager("Binding::preallocateView");
auto *mountingManager = getMountingManager("preallocateView");
if (!mountingManager) {
return;
}
mountingManager->preallocateShadowView(surfaceId, shadowView);
mountingManager->preallocateShadowView(surfaceId, ShadowView(shadowNode));
}
void Binding::schedulerDidDispatchCommand(
const ShadowView &shadowView,
std::string const &commandName,
folly::dynamic const &args) {
auto &mountingManager =
verifyMountingManager("Binding::schedulerDidDispatchCommand");
auto *mountingManager = getMountingManager("schedulerDidDispatchCommand");
if (!mountingManager) {
return;
}
@@ -528,8 +513,8 @@ void Binding::schedulerDidDispatchCommand(
void Binding::schedulerDidSendAccessibilityEvent(
const ShadowView &shadowView,
std::string const &eventType) {
auto &mountingManager =
verifyMountingManager("Binding::schedulerDidSendAccessibilityEvent");
auto *mountingManager =
getMountingManager("schedulerDidSendAccessibilityEvent");
if (!mountingManager) {
return;
}
@@ -540,8 +525,7 @@ void Binding::schedulerDidSetIsJSResponder(
ShadowView const &shadowView,
bool isJSResponder,
bool blockNativeResponder) {
auto &mountingManager =
verifyMountingManager("Binding::schedulerDidSetIsJSResponder");
auto *mountingManager = getMountingManager("schedulerDidSetIsJSResponder");
if (!mountingManager) {
return;
}
@@ -550,7 +534,7 @@ void Binding::schedulerDidSetIsJSResponder(
}
void Binding::onAnimationStarted() {
auto &mountingManager = verifyMountingManager("Binding::onAnimationStarted");
auto *mountingManager = getMountingManager("onAnimationStarted");
if (!mountingManager) {
return;
}
@@ -558,7 +542,7 @@ void Binding::onAnimationStarted() {
}
void Binding::onAllAnimationsComplete() {
auto &mountingManager = verifyMountingManager("Binding::onAnimationComplete");
auto *mountingManager = getMountingManager("onAnimationComplete");
if (!mountingManager) {
return;
}
packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.h
+2 -5
View File
@@ -116,8 +116,6 @@ class Binding : public jni::HybridClass<Binding>,
bool isJSResponder,
bool blockNativeResponder) override;
void preallocateView(SurfaceId surfaceId, ShadowNode const &shadowNode);
void setPixelDensity(float pointScaleFactor);
void driveCxxAnimations();
@@ -126,11 +124,10 @@ class Binding : public jni::HybridClass<Binding>,
// Private member variables
std::shared_mutex installMutex_;
std::shared_ptr<FabricMountingManager> mountingManager_;
std::unique_ptr<FabricMountingManager> mountingManager_;
std::shared_ptr<Scheduler> scheduler_;
const std::shared_ptr<FabricMountingManager> &verifyMountingManager(
const char *locationHint);
FabricMountingManager *getMountingManager(const char *locationHint);
// LayoutAnimations
void onAnimationStarted() override;
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h
+1
View File
@@ -25,6 +25,7 @@ class FabricMountingManager final {
FabricMountingManager(
std::shared_ptr<const ReactNativeConfig> &config,
jni::global_ref<JFabricUIManager::javaobject> &javaUIManager);
FabricMountingManager(const FabricMountingManager &) = delete;
void onSurfaceStart(SurfaceId surfaceId);