Skip to content

Commit 6ac687d

Browse files
committed
Add back frames track if not RN
1 parent 8855c93 commit 6ac687d

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

front_end/panels/timeline/TimelineFlameChartDataProvider.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
106106

107107
export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectWrapper<EventTypes> implements
108108
PerfUI.FlameChart.FlameChartDataProvider {
109+
private isReactNative = false;
110+
109111
private droppedFramePatternCanvas: HTMLCanvasElement;
110112
private partialFramePatternCanvas: HTMLCanvasElement;
111113
private timelineDataInternal: PerfUI.FlameChart.FlameChartTimelineData|null = null;
@@ -143,6 +145,11 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
143145
constructor() {
144146
super();
145147

148+
// [RN] Used to scope down available features for React Native targets
149+
this.isReactNative = Root.Runtime.experiments.isEnabled(
150+
Root.Runtime.ExperimentName.REACT_NATIVE_SPECIFIC_UI,
151+
);
152+
146153
this.reset();
147154

148155
this.droppedFramePatternCanvas = document.createElement('canvas');
@@ -608,7 +615,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
608615
// In CPU Profiles the trace data will not have frames nor
609616
// screenshots, so we can keep this call as it will be a no-op in
610617
// these cases.
611-
if (Root.Runtime.experiments.isEnabled(Root.Runtime.RNExperimentName.ENABLE_TIMELINE_FRAMES)) {
618+
if (Root.Runtime.experiments.isEnabled(Root.Runtime.RNExperimentName.ENABLE_TIMELINE_FRAMES) || !this.isReactNative) {
612619
this.#appendFramesAndScreenshotsTrack();
613620
}
614621

front_end/testing/EnvironmentHelpers.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ const REGISTERED_EXPERIMENTS = [
130130
Root.Runtime.ExperimentName.TIMELINE_ALTERNATIVE_NAVIGATION,
131131
Root.Runtime.ExperimentName.REACT_NATIVE_SPECIFIC_UI,
132132
Root.Runtime.ExperimentName.NOT_REACT_NATIVE_SPECIFIC_UI,
133+
Root.Runtime.ExperimentName.ENABLE_TIMELINE_FRAMES,
133134
];
134135

135136
export async function initializeGlobalVars({reset = true} = {}) {

0 commit comments

Comments
 (0)