diff --git a/src/app-logic/url-handling.js b/src/app-logic/url-handling.js index 0297db06b1..db71236de1 100644 --- a/src/app-logic/url-handling.js +++ b/src/app-logic/url-handling.js @@ -576,13 +576,13 @@ export function stateFromLocation( const selectedTab = toValidTabSlug(pathParts[selectedTabPathPart]) || 'calltree'; const sourceView: SourceViewState = { - activationGeneration: 0, + scrollGeneration: 0, libIndex: null, sourceFile: null, }; const assemblyView: AssemblyViewState = { isOpen: false, - activationGeneration: 0, + scrollGeneration: 0, nativeSymbol: null, allNativeSymbolsForInitiatingCallNode: [], }; diff --git a/src/components/app/BottomBox.js b/src/components/app/BottomBox.js index 9cb1dfe1a9..58506974c6 100644 --- a/src/components/app/BottomBox.js +++ b/src/components/app/BottomBox.js @@ -9,7 +9,7 @@ import classNames from 'classnames'; import { SourceView } from '../shared/SourceView'; import { getSourceViewFile, - getSourceViewActivationGeneration, + getSourceViewScrollGeneration, } from 'firefox-profiler/selectors/url-state'; import { selectedThreadSelectors, @@ -34,7 +34,7 @@ type StateProps = {| +sourceViewSource: FileSourceStatus | void, +globalLineTimings: LineTimings, +selectedCallNodeLineTimings: LineTimings, - +sourceViewActivationGeneration: number, + +sourceViewScrollGeneration: number, +disableOverscan: boolean, |}; @@ -218,7 +218,7 @@ class BottomBoxImpl extends React.PureComponent { sourceViewSource, globalLineTimings, disableOverscan, - sourceViewActivationGeneration, + sourceViewScrollGeneration, selectedCallNodeLineTimings, } = this.props; const source = @@ -253,7 +253,7 @@ class BottomBoxImpl extends React.PureComponent { timings={globalLineTimings} source={source} filePath={path} - scrollToHotSpotGeneration={sourceViewActivationGeneration} + scrollToHotSpotGeneration={sourceViewScrollGeneration} hotSpotTimings={selectedCallNodeLineTimings} ref={this._sourceView} /> @@ -275,7 +275,7 @@ export const BottomBox = explicitConnect<{||}, StateProps, DispatchProps>({ globalLineTimings: selectedThreadSelectors.getSourceViewLineTimings(state), selectedCallNodeLineTimings: selectedNodeSelectors.getSourceViewLineTimings(state), - sourceViewActivationGeneration: getSourceViewActivationGeneration(state), + sourceViewScrollGeneration: getSourceViewScrollGeneration(state), disableOverscan: getPreviewSelection(state).isModifying, }), mapDispatchToProps: { diff --git a/src/reducers/url-state.js b/src/reducers/url-state.js index 6594ab0d26..e6b18f44f2 100644 --- a/src/reducers/url-state.js +++ b/src/reducers/url-state.js @@ -555,13 +555,13 @@ const timelineTrackOrganization: Reducer = ( }; const sourceView: Reducer = ( - state = { activationGeneration: 0, libIndex: null, sourceFile: null }, + state = { scrollGeneration: 0, libIndex: null, sourceFile: null }, action ) => { switch (action.type) { case 'UPDATE_BOTTOM_BOX': { return { - activationGeneration: state.activationGeneration + 1, + scrollGeneration: state.scrollGeneration + 1, libIndex: action.libIndex, sourceFile: action.sourceFile, }; @@ -573,7 +573,7 @@ const sourceView: Reducer = ( const assemblyView: Reducer = ( state = { - activationGeneration: 0, + scrollGeneration: 0, nativeSymbol: null, allNativeSymbolsForInitiatingCallNode: [], isOpen: false, @@ -583,7 +583,7 @@ const assemblyView: Reducer = ( switch (action.type) { case 'UPDATE_BOTTOM_BOX': { return { - activationGeneration: state.activationGeneration + 1, + scrollGeneration: state.scrollGeneration + 1, nativeSymbol: action.nativeSymbol, allNativeSymbolsForInitiatingCallNode: action.allNativeSymbolsForInitiatingCallNode, diff --git a/src/selectors/url-state.js b/src/selectors/url-state.js index ccc70924c2..08e520dab1 100644 --- a/src/selectors/url-state.js +++ b/src/selectors/url-state.js @@ -78,8 +78,8 @@ export const getShowUserTimings: Selector = (state) => getProfileSpecificState(state).showUserTimings; export const getSourceViewFile: Selector = (state) => getProfileSpecificState(state).sourceView.sourceFile; -export const getSourceViewActivationGeneration: Selector = (state) => - getProfileSpecificState(state).sourceView.activationGeneration; +export const getSourceViewScrollGeneration: Selector = (state) => + getProfileSpecificState(state).sourceView.scrollGeneration; export const getShowJsTracerSummary: Selector = (state) => getFullProfileSpecificState(state).showJsTracerSummary; export const getTimelineTrackOrganization: Selector< diff --git a/src/types/state.js b/src/types/state.js index 94bc1f1a19..e1b774a380 100644 --- a/src/types/state.js +++ b/src/types/state.js @@ -246,7 +246,7 @@ export type ZippedProfilesState = { }; export type SourceViewState = {| - activationGeneration: number, + scrollGeneration: number, // Non-null if this source file was opened for a function from native code. // In theory, multiple different libraries can have source files with the same // path but different content. @@ -264,7 +264,7 @@ export type AssemblyViewState = {| // true even if the bottom box itself is closed. isOpen: boolean, // When this is incremented, the assembly view scrolls to the "hotspot" line. - activationGeneration: number, + scrollGeneration: number, // The native symbol for which the assembly code is being shown at the moment. // Null if the initiating call node did not have a native symbol. nativeSymbol: NativeSymbolInfo | null,