Use the correct sample index offset in TrackThread.

Fixes #5326.
firefox-devtools · Jan 17, 2025 · 8821403 · 8821403
1 parent 8850a56
commit 8821403
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/components/timeline/TrackThread.js b/src/components/timeline/TrackThread.js
@@ -354,7 +354,7 @@ export const TimelineTrackThread = explicitConnect<
       interval: getProfileInterval(state),
       rangeStart: committedRange.start,
       rangeEnd: committedRange.end,
-      sampleIndexOffset: selectors.getFilteredCtssSampleIndexOffset(state), // Bug! #5326
+      sampleIndexOffset: selectors.getFilteredSampleIndexOffset(state),
       categories: getCategories(state),
       timelineType,
       hasFileIoMarkers:

diff --git a/src/selectors/per-thread/thread.js b/src/selectors/per-thread/thread.js
@@ -270,6 +270,19 @@ export function getBasicThreadSelectorsPerThread(
     }
   );
 
+  const getFilteredSampleIndexOffset: Selector<number> = createSelector(
+    (state) => getSamplesTable(state),
+    ProfileSelectors.getCommittedRange,
+    (samples, { start, end }) => {
+      const [beginSampleIndex] = ProfileData.getSampleIndexRangeForSelection(
+        samples,
+        start,
+        end
+      );
+      return beginSampleIndex;
+    }
+  );
+
   const getFriendlyThreadName: Selector<string> = createSelector(
     ProfileSelectors.getThreads,
     getThread,
@@ -380,6 +393,7 @@ export function getBasicThreadSelectorsPerThread(
     getRangeFilteredThread,
     getUnfilteredCtssSamples,
     getFilteredCtssSampleIndexOffset,
+    getFilteredSampleIndexOffset,
     getFriendlyThreadName,
     getThreadProcessDetails,
     getViewOptions,