Skip to content

Remove move constructor from SurfaceHandler #54108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+42 −53
Open

Remove move constructor from SurfaceHandler #54108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-native/React/Fabric/Surface/RCTFabricSurface.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ - (instancetype)initWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter
if (self = [super init]) {
_surfacePresenter = surfacePresenter;

_surfaceHandler = SurfaceHandler{RCTStringFromNSString(moduleName), getNextRootViewTag()};
_surfaceHandler.emplace(RCTStringFromNSString(moduleName), getNextRootViewTag());
_surfaceHandler->setProps(convertIdToFollyDynamic(initialProperties));

[_surfacePresenter registerSurface:self];
Expand Down
62 changes: 36 additions & 26 deletions packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,34 +166,39 @@ void FabricUIManagerBinding::startSurface(
return;
}

auto layoutContext = LayoutContext{};
layoutContext.pointScaleFactor = pointScaleFactor_;
SurfaceHandler* surfaceHandler = nullptr;
{
std::unique_lock lock(surfaceHandlerRegistryMutex_);
auto [it, _] = surfaceHandlerRegistry_.try_emplace(
surfaceId,
std::in_place_index<0>,
moduleName->toStdString(),
surfaceId);
surfaceHandler = &std::get<SurfaceHandler>(it->second);
}

auto surfaceHandler = SurfaceHandler{moduleName->toStdString(), surfaceId};
surfaceHandler.setContextContainer(scheduler->getContextContainer());
surfaceHandler->setContextContainer(scheduler->getContextContainer());
if (initialProps != nullptr) {
surfaceHandler.setProps(initialProps->consume());
surfaceHandler->setProps(initialProps->consume());
}
surfaceHandler.constraintLayout({}, layoutContext);

scheduler->registerSurface(surfaceHandler);
auto layoutContext = LayoutContext{};
layoutContext.pointScaleFactor = pointScaleFactor_;
surfaceHandler->constraintLayout({}, layoutContext);

scheduler->registerSurface(*surfaceHandler);

auto mountingManager = getMountingManager("startSurface");
if (mountingManager != nullptr) {
mountingManager->onSurfaceStart(surfaceId);
}

surfaceHandler.start();
surfaceHandler->start();

if (ReactNativeFeatureFlags::enableLayoutAnimationsOnAndroid()) {
surfaceHandler.getMountingCoordinator()->setMountingOverrideDelegate(
surfaceHandler->getMountingCoordinator()->setMountingOverrideDelegate(
animationDriver_);
}

{
std::unique_lock lock(surfaceHandlerRegistryMutex_);
surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
}
}

jint FabricUIManagerBinding::findNextFocusableElement(
Expand Down Expand Up @@ -338,31 +343,36 @@ void FabricUIManagerBinding::startSurfaceWithConstraints(
constraints.layoutDirection =
isRTL != 0 ? LayoutDirection::RightToLeft : LayoutDirection::LeftToRight;

auto surfaceHandler = SurfaceHandler{moduleName->toStdString(), surfaceId};
surfaceHandler.setContextContainer(scheduler->getContextContainer());
SurfaceHandler* surfaceHandler = nullptr;
{
std::unique_lock lock(surfaceHandlerRegistryMutex_);
auto [it, _] = surfaceHandlerRegistry_.try_emplace(
surfaceId,
std::in_place_index<0>,
moduleName->toStdString(),
surfaceId);
surfaceHandler = &std::get<SurfaceHandler>(it->second);
}

surfaceHandler->setContextContainer(scheduler->getContextContainer());
if (initialProps != nullptr) {
surfaceHandler.setProps(initialProps->consume());
surfaceHandler->setProps(initialProps->consume());
}
surfaceHandler.constraintLayout(constraints, context);
surfaceHandler->constraintLayout(constraints, context);

scheduler->registerSurface(surfaceHandler);
scheduler->registerSurface(*surfaceHandler);

auto mountingManager = getMountingManager("startSurfaceWithConstraints");
if (mountingManager != nullptr) {
mountingManager->onSurfaceStart(surfaceId);
}

surfaceHandler.start();
surfaceHandler->start();

if (ReactNativeFeatureFlags::enableLayoutAnimationsOnAndroid()) {
surfaceHandler.getMountingCoordinator()->setMountingOverrideDelegate(
surfaceHandler->getMountingCoordinator()->setMountingOverrideDelegate(
animationDriver_);
}

{
std::unique_lock lock(surfaceHandlerRegistryMutex_);
surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
}
}

// Used by non-bridgeless+Fabric
Expand Down
20 changes: 0 additions & 20 deletions packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,6 @@ SurfaceHandler::SurfaceHandler(
parameters_.surfaceId = surfaceId;
}

SurfaceHandler::SurfaceHandler(SurfaceHandler&& other) noexcept {
operator=(std::move(other));
}

SurfaceHandler& SurfaceHandler::operator=(SurfaceHandler&& other) noexcept {
std::unique_lock lock1(linkMutex_, std::defer_lock);
std::unique_lock lock2(parametersMutex_, std::defer_lock);
std::unique_lock lock3(other.linkMutex_, std::defer_lock);
std::unique_lock lock4(other.parametersMutex_, std::defer_lock);
std::lock(lock1, lock2, lock3, lock4);

link_ = other.link_;
parameters_ = other.parameters_;

other.link_ = Link{};
other.parameters_ = Parameters{};
other.parameters_.contextContainer = parameters_.contextContainer;
return *this;
}

#pragma mark - Surface Life-Cycle Management

void SurfaceHandler::setContextContainer(
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ class SurfaceHandler {
virtual ~SurfaceHandler() noexcept;

/*
* Movable-only.
* Not moveable or copyable
*/
SurfaceHandler(SurfaceHandler&& other) noexcept;
SurfaceHandler(SurfaceHandler&& other) noexcept = delete;
SurfaceHandler(const SurfaceHandler& SurfaceHandler) noexcept = delete;
SurfaceHandler& operator=(SurfaceHandler&& other) noexcept;
SurfaceHandler& operator=(SurfaceHandler&& other) noexcept = delete;
SurfaceHandler& operator=(const SurfaceHandler& other) noexcept = delete;

#pragma mark - Surface Life-Cycle Management
Expand Down
5 changes: 2 additions & 3 deletions packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ void SurfaceManager::startSurface(
const LayoutContext& layoutContext) noexcept {
{
std::unique_lock lock(mutex_);
auto surfaceHandler = SurfaceHandler{moduleName, surfaceId};
surfaceHandler.setContextContainer(scheduler_.getContextContainer());
registry_.emplace(surfaceId, std::move(surfaceHandler));
auto [it, _] = registry_.try_emplace(surfaceId, moduleName, surfaceId);
it->second.setContextContainer(scheduler_.getContextContainer());
}

visit(surfaceId, [&](const SurfaceHandler& surfaceHandler) {
Expand Down
Loading