Skip to content

Remove remaining private includes from scheduler headers #58137

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
j-piasecki wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Remove remaining private includes from scheduler headers #58137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fd2285
Cover `react/renderer/scheduler` with Stable API guards
j-piasecki Aug 25, 2026
f3580b6
Forward declare CDP reporters and ViewTransitionModule in Scheduler.h
j-piasecki Aug 25, 2026
7ca99f3
Remove remaining private includes from scheduler headers
j-piasecki Aug 25, 2026
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
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ target_link_libraries(react_renderer_scheduler
folly_runtime
glog
jsi
react_cxxstableapi
react_debug
react_featureflags
react_performance_cdpmetrics
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/scheduler/InspectorData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/FrameworksGuard.h>

#include <vector>

namespace facebook::react {
Expand Down
20 changes: 14 additions & 6 deletions packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,21 @@
#include <cxxreact/TraceSection.h>
#include <react/debug/react_native_assert.h>
#include <react/featureflags/ReactNativeFeatureFlags.h>
#include <react/performance/cdpmetrics/CdpMetricsReporter.h>
#include <react/performance/cdpmetrics/CdpPerfIssuesReporter.h>
#include <react/performance/timeline/PerformanceEntryReporter.h>
#include <react/renderer/animationbackend/AnimationBackend.h>
#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
#include <react/renderer/core/EventQueueProcessor.h>
#include <react/renderer/core/LayoutContext.h>
#include <react/renderer/mounting/MountingOverrideDelegate.h>
#include <react/renderer/mounting/ShadowViewMutation.h>
#include <react/renderer/observers/events/EventPerformanceLogger.h>
#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
#include <react/renderer/uimanager/LayoutEventEmitter.h>
#include <react/renderer/uimanager/UIManager.h>
#include <react/renderer/uimanager/UIManagerBinding.h>
#include <react/renderer/viewtransition/ViewTransitionModule.h>
#include <mutex>

namespace facebook::react {
Expand All @@ -44,13 +49,15 @@ Scheduler::Scheduler(

if (ReactNativeFeatureFlags::enableBridgelessArchitecture() &&
ReactNativeFeatureFlags::cdpInteractionMetricsEnabled()) {
cdpMetricsReporter_.emplace(CdpMetricsReporter{runtimeExecutor_});
performanceEntryReporter_->addEventListener(&*cdpMetricsReporter_);
cdpMetricsReporter_ =
std::make_unique<CdpMetricsReporter>(runtimeExecutor_);
performanceEntryReporter_->addEventListener(cdpMetricsReporter_.get());
}

if (ReactNativeFeatureFlags::perfIssuesEnabled()) {
cdpPerfIssuesReporter_.emplace(CdpPerfIssuesReporter{runtimeExecutor_});
performanceEntryReporter_->addEventListener(&*cdpPerfIssuesReporter_);
cdpPerfIssuesReporter_ =
std::make_unique<CdpPerfIssuesReporter>(runtimeExecutor_);
performanceEntryReporter_->addEventListener(cdpPerfIssuesReporter_.get());
}

eventPerformanceLogger_ =
Expand Down Expand Up @@ -216,10 +223,11 @@ Scheduler::~Scheduler() {
uiManager_->setViewTransitionDelegate(nullptr);

if (cdpMetricsReporter_) {
performanceEntryReporter_->removeEventListener(&*cdpMetricsReporter_);
performanceEntryReporter_->removeEventListener(cdpMetricsReporter_.get());
}
if (cdpPerfIssuesReporter_) {
performanceEntryReporter_->removeEventListener(&*cdpPerfIssuesReporter_);
performanceEntryReporter_->removeEventListener(
cdpPerfIssuesReporter_.get());
}

// Then, let's verify that the requirement was satisfied.
Expand Down
19 changes: 12 additions & 7 deletions packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,38 @@

#pragma once

#include <react/cxxstableapi/FrameworksGuard.h>

#include <atomic>
#include <memory>
#include <optional>
#include <shared_mutex>
#include <vector>

#include <ReactCommon/RuntimeExecutor.h>
#include <react/performance/cdpmetrics/CdpMetricsReporter.h>
#include <react/performance/cdpmetrics/CdpPerfIssuesReporter.h>
#include <react/performance/timeline/PerformanceEntryReporter.h>
#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
#include <react/renderer/core/ComponentDescriptor.h>
#include <react/renderer/core/EventEmitter.h>
#include <react/renderer/core/EventListener.h>
#include <react/renderer/core/LayoutConstraints.h>
#include <react/renderer/mounting/MountingOverrideDelegate.h>
#include <react/renderer/observers/events/EventPerformanceLogger.h>
#include <react/renderer/scheduler/InspectorData.h>
#include <react/renderer/scheduler/SchedulerDelegate.h>
#include <react/renderer/scheduler/SchedulerToolbox.h>
#include <react/renderer/scheduler/SurfaceHandler.h>
#include <react/renderer/uimanager/UIManagerAnimationDelegate.h>
#include <react/renderer/uimanager/UIManagerBinding.h>
#include <react/renderer/uimanager/UIManagerDelegate.h>
#include <react/renderer/viewtransition/ViewTransitionModule.h>
#include <react/utils/ContextContainer.h>

namespace facebook::react {

class CdpMetricsReporter;
class CdpPerfIssuesReporter;
class EventPerformanceLogger;
class PerformanceEntryReporter;
class ViewTransitionModule;

/*
* Scheduler coordinates Shadow Tree updates and event flows.
*/
Expand Down Expand Up @@ -145,8 +150,8 @@ class Scheduler final : public UIManagerDelegate {
std::shared_ptr<std::optional<const EventDispatcher>> eventDispatcher_;

std::shared_ptr<PerformanceEntryReporter> performanceEntryReporter_;
std::optional<CdpMetricsReporter> cdpMetricsReporter_;
std::optional<CdpPerfIssuesReporter> cdpPerfIssuesReporter_;
std::unique_ptr<CdpMetricsReporter> cdpMetricsReporter_;
std::unique_ptr<CdpPerfIssuesReporter> cdpPerfIssuesReporter_;
std::shared_ptr<EventPerformanceLogger> eventPerformanceLogger_;

/**
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/FrameworksGuard.h>

#include <memory>

#include <react/renderer/core/ReactPrimitives.h>
Expand Down
3 changes: 2 additions & 1 deletion packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@

#pragma once

#include <react/cxxstableapi/FrameworksGuard.h>

#include <memory>

#include <ReactCommon/RuntimeExecutor.h>
#include <react/renderer/animationbackend/AnimationChoreographer.h>
#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
#include <react/renderer/core/EventBeat.h>
#include <react/renderer/leakchecker/LeakChecker.h>
#include <react/renderer/uimanager/UIManagerCommitHook.h>
#include <react/renderer/uimanager/primitives.h>
#include <react/utils/ContextContainer.h>
Expand Down
2 changes: 2 additions & 0 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 @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/FrameworksGuard.h>

#include <memory>
#include <shared_mutex>

Expand Down
2 changes: 2 additions & 0 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 @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/FrameworksGuard.h>

#include <mutex>
#include <optional>
#include <shared_mutex>
Expand Down
Loading