Skip to content

Make SurfaceManager const correct #48485

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

Closed
christophpurrer wants to merge 1 commit into from
Closed

Make SurfaceManager const correct #48485

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
6 changes: 3 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 @@ -26,7 +26,7 @@ void SurfaceManager::startSurface(
const std::string& moduleName,
const folly::dynamic& props,
const LayoutConstraints& layoutConstraints,
const LayoutContext& layoutContext) const noexcept {
const LayoutContext& layoutContext) noexcept {
{
std::unique_lock lock(mutex_);
auto surfaceHandler = SurfaceHandler{moduleName, surfaceId};
Expand All @@ -44,7 +44,7 @@ void SurfaceManager::startSurface(
});
}

void SurfaceManager::stopSurface(SurfaceId surfaceId) const noexcept {
void SurfaceManager::stopSurface(SurfaceId surfaceId) noexcept {
visit(surfaceId, [&](const SurfaceHandler& surfaceHandler) {
surfaceHandler.stop();
scheduler_.unregisterSurface(surfaceHandler);
Expand All @@ -58,7 +58,7 @@ void SurfaceManager::stopSurface(SurfaceId surfaceId) const noexcept {
}
}

void SurfaceManager::stopAllSurfaces() const noexcept {
void SurfaceManager::stopAllSurfaces() noexcept {
std::unordered_set<SurfaceId> surfaceIds;
{
std::shared_lock lock(mutex_);
Expand Down
8 changes: 4 additions & 4 deletions packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ class SurfaceManager final {
const std::string& moduleName,
const folly::dynamic& props,
const LayoutConstraints& layoutConstraints = {},
const LayoutContext& layoutContext = {}) const noexcept;
const LayoutContext& layoutContext = {}) noexcept;

void stopSurface(SurfaceId surfaceId) const noexcept;
void stopSurface(SurfaceId surfaceId) noexcept;

void stopAllSurfaces() const noexcept;
void stopAllSurfaces() noexcept;

Size measureSurface(
SurfaceId surfaceId,
Expand All @@ -63,7 +63,7 @@ class SurfaceManager final {

const Scheduler& scheduler_;
mutable std::shared_mutex mutex_; // Protects `registry_`.
mutable std::unordered_map<SurfaceId, SurfaceHandler> registry_{};
std::unordered_map<SurfaceId, SurfaceHandler> registry_{};
};

} // namespace facebook::react