{"commit":{"revision":"13455d26d1904519c53686d6f295d4eb50b6c2fc","shortRevision":"13455d26d1","authorName":"Brian Vaughn","authorEmail":"bvaughn@fb.com","subject":"Cleaned up remaining \"scheduling profiler\" references in DevTools (#22696)","authoredAt":"2021-11-04T11:40:45-04:00"},"parents":["8ca3f567bc3ed56c2101e5c51f968a5339f63093"],"body":"","files":[{"path":"packages\/react-devtools-extensions\/src\/main.js","status":"M"},{"path":"packages\/react-devtools-inline\/src\/frontend.js","status":"M"},{"path":"packages\/react-devtools-shared\/src\/devtools\/store.js","status":"M"},{"path":"packages\/react-devtools-shared\/src\/devtools\/views\/DevTools.js","status":"M"},{"path":"packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/ClearProfilingDataButton.js","status":"M"},{"path":"packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/Profiler.js","status":"M"},{"path":"packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/ProfilingImportExportButtons.js","status":"M"},{"path":"packages\/react-devtools-timeline\/src\/Timeline.css","status":"R100","previousPath":"packages\/react-devtools-timeline\/src\/SchedulingProfiler.css"},{"path":"packages\/react-devtools-timeline\/src\/Timeline.js","status":"R089","previousPath":"packages\/react-devtools-timeline\/src\/SchedulingProfiler.js"},{"path":"packages\/react-devtools-timeline\/src\/TimelineContext.js","status":"R060","previousPath":"packages\/react-devtools-timeline\/src\/SchedulingProfilerContext.js"}],"patch":"diff --git a\/packages\/react-devtools-extensions\/src\/main.js b\/packages\/react-devtools-extensions\/src\/main.js\nindex 36625cf74e..015472fa2e 100644\n--- a\/packages\/react-devtools-extensions\/src\/main.js\n+++ b\/packages\/react-devtools-extensions\/src\/main.js\n@@ -153,7 +153,7 @@ function createPanelIfReactLoaded() {\n supportsReloadAndProfile: isChrome || isEdge,\n supportsProfiling,\n \/\/ At this time, the timeline can only parse Chrome performance profiles.\n- supportsSchedulingProfiler: isChrome,\n+ supportsTimeline: isChrome,\n supportsTraceUpdates: true,\n });\n store.profilerStore.profilingData = profilingData;\ndiff --git a\/packages\/react-devtools-inline\/src\/frontend.js b\/packages\/react-devtools-inline\/src\/frontend.js\nindex 0249fb878f..065bb12387 100644\n--- a\/packages\/react-devtools-inline\/src\/frontend.js\n+++ b\/packages\/react-devtools-inline\/src\/frontend.js\n@@ -29,7 +29,7 @@ export function createStore(bridge: FrontendBridge, config?: Config): Store {\n return new Store(bridge, {\n checkBridgeProtocolCompatibility: true,\n supportsTraceUpdates: true,\n- supportsSchedulingProfiler: true,\n+ supportsTimeline: true,\n supportsNativeInspection: config?.supportsNativeInspection !== false,\n });\n }\ndiff --git a\/packages\/react-devtools-shared\/src\/devtools\/store.js b\/packages\/react-devtools-shared\/src\/devtools\/store.js\nindex 217abe7f72..c8b252072d 100644\n--- a\/packages\/react-devtools-shared\/src\/devtools\/store.js\n+++ b\/packages\/react-devtools-shared\/src\/devtools\/store.js\n@@ -63,9 +63,9 @@ type Config = {|\n checkBridgeProtocolCompatibility?: boolean,\n isProfiling?: boolean,\n supportsNativeInspection?: boolean,\n- supportsReloadAndProfile?: boolean,\n- supportsSchedulingProfiler?: boolean,\n supportsProfiling?: boolean,\n+ supportsReloadAndProfile?: boolean,\n+ supportsTimeline?: boolean,\n supportsTraceUpdates?: boolean,\n |};\n \n@@ -162,7 +162,7 @@ export default class Store extends EventEmitter<{|\n _supportsNativeInspection: boolean = true;\n _supportsProfiling: boolean = false;\n _supportsReloadAndProfile: boolean = false;\n- _supportsSchedulingProfiler: boolean = false;\n+ _supportsTimeline: boolean = false;\n _supportsTraceUpdates: boolean = false;\n \n _unsupportedBridgeProtocol: BridgeProtocol | null = null;\n@@ -197,7 +197,7 @@ export default class Store extends EventEmitter<{|\n supportsNativeInspection,\n supportsProfiling,\n supportsReloadAndProfile,\n- supportsSchedulingProfiler,\n+ supportsTimeline,\n supportsTraceUpdates,\n } = config;\n this._supportsNativeInspection = supportsNativeInspection !== false;\n@@ -207,8 +207,8 @@ export default class Store extends EventEmitter<{|\n if (supportsReloadAndProfile) {\n this._supportsReloadAndProfile = true;\n }\n- if (supportsSchedulingProfiler) {\n- this._supportsSchedulingProfiler = true;\n+ if (supportsTimeline) {\n+ this._supportsTimeline = true;\n }\n if (supportsTraceUpdates) {\n this._supportsTraceUpdates = true;\n@@ -422,8 +422,8 @@ export default class Store extends EventEmitter<{|\n );\n }\n \n- get supportsSchedulingProfiler(): boolean {\n- return this._supportsSchedulingProfiler;\n+ get supportsTimeline(): boolean {\n+ return this._supportsTimeline;\n }\n \n get supportsTraceUpdates(): boolean {\ndiff --git a\/packages\/react-devtools-shared\/src\/devtools\/views\/DevTools.js b\/packages\/react-devtools-shared\/src\/devtools\/views\/DevTools.js\nindex b0b8f03032..b16429b5bc 100644\n--- a\/packages\/react-devtools-shared\/src\/devtools\/views\/DevTools.js\n+++ b\/packages\/react-devtools-shared\/src\/devtools\/views\/DevTools.js\n@@ -30,7 +30,7 @@ import ViewElementSourceContext from '.\/Components\/ViewElementSourceContext';\n import FetchFileWithCachingContext from '.\/Components\/FetchFileWithCachingContext';\n import HookNamesModuleLoaderContext from 'react-devtools-shared\/src\/devtools\/views\/Components\/HookNamesModuleLoaderContext';\n import {ProfilerContextController} from '.\/Profiler\/ProfilerContext';\n-import {SchedulingProfilerContextController} from 'react-devtools-timeline\/src\/SchedulingProfilerContext';\n+import {TimelineContextController} from 'react-devtools-timeline\/src\/TimelineContext';\n import {ModalDialogContextController} from '.\/ModalDialog';\n import ReactLogo from '.\/ReactLogo';\n import UnsupportedBridgeProtocolDialog from '.\/UnsupportedBridgeProtocolDialog';\n@@ -273,7 +273,7 @@ export default function DevTools({\n value={fetchFileWithCaching || null}>\n \n \n- \n+ \n \n \n <\/div>\n <\/ThemeProvider>\n- <\/SchedulingProfilerContextController>\n+ <\/TimelineContextController>\n <\/ProfilerContextController>\n <\/TreeContextController>\n <\/FetchFileWithCachingContext.Provider>\ndiff --git a\/packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/ClearProfilingDataButton.js b\/packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/ClearProfilingDataButton.js\nindex 3f3a8e4987..f57b4ba8e1 100644\n--- a\/packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/ClearProfilingDataButton.js\n+++ b\/packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/ClearProfilingDataButton.js\n@@ -13,28 +13,26 @@ import {ProfilerContext} from '.\/ProfilerContext';\n import Button from '..\/Button';\n import ButtonIcon from '..\/ButtonIcon';\n import {StoreContext} from '..\/context';\n-import {SchedulingProfilerContext} from 'react-devtools-timeline\/src\/SchedulingProfilerContext';\n+import {TimelineContext} from 'react-devtools-timeline\/src\/TimelineContext';\n \n export default function ClearProfilingDataButton() {\n const store = useContext(StoreContext);\n const {didRecordCommits, isProfiling, selectedTabID} = useContext(\n ProfilerContext,\n );\n- const {clearSchedulingProfilerData, schedulingProfilerData} = useContext(\n- SchedulingProfilerContext,\n- );\n+ const {clearTimelineData, timelineData} = useContext(TimelineContext);\n const {profilerStore} = store;\n \n let doesHaveData = false;\n if (selectedTabID === 'timeline') {\n- doesHaveData = schedulingProfilerData !== null;\n+ doesHaveData = timelineData !== null;\n } else {\n doesHaveData = didRecordCommits;\n }\n \n const clear = () => {\n if (selectedTabID === 'timeline') {\n- clearSchedulingProfilerData();\n+ clearTimelineData();\n } else {\n profilerStore.clear();\n }\ndiff --git a\/packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/Profiler.js b\/packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/Profiler.js\nindex a9f57f5c47..0bd6b0375e 100644\n--- a\/packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/Profiler.js\n+++ b\/packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/Profiler.js\n@@ -16,7 +16,7 @@ import ClearProfilingDataButton from '.\/ClearProfilingDataButton';\n import CommitFlamegraph from '.\/CommitFlamegraph';\n import CommitRanked from '.\/CommitRanked';\n import RootSelector from '.\/RootSelector';\n-import {SchedulingProfiler} from 'react-devtools-timeline\/src\/SchedulingProfiler';\n+import {Timeline} from 'react-devtools-timeline\/src\/Timeline';\n import RecordToggle from '.\/RecordToggle';\n import ReloadAndProfileButton from '.\/ReloadAndProfileButton';\n import ProfilingImportExportButtons from '.\/ProfilingImportExportButtons';\n@@ -43,7 +43,7 @@ function Profiler(_: {||}) {\n supportsProfiling,\n } = useContext(ProfilerContext);\n \n- const {supportsSchedulingProfiler} = useContext(StoreContext);\n+ const {supportsTimeline} = useContext(StoreContext);\n \n let isLegacyProfilerSelected = false;\n \n@@ -59,7 +59,7 @@ function Profiler(_: {||}) {\n view = ;\n break;\n case 'timeline':\n- view = ;\n+ view = ;\n break;\n default:\n break;\n@@ -116,9 +116,7 @@ function Profiler(_: {||}) {\n currentTab={selectedTabID}\n id=\"Profiler\"\n selectTab={selectTab}\n- tabs={\n- supportsSchedulingProfiler ? tabsWithSchedulingProfiler : tabs\n- }\n+ tabs={supportsTimeline ? tabsWithTimeline : tabs}\n type=\"profiler\"\n \/>\n \n@@ -160,7 +158,7 @@ const tabs = [\n },\n ];\n \n-const tabsWithSchedulingProfiler = [\n+const tabsWithTimeline = [\n ...tabs,\n null, \/\/ Divider\/separator\n {\ndiff --git a\/packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/ProfilingImportExportButtons.js b\/packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/ProfilingImportExportButtons.js\nindex 912f87745e..574da0639e 100644\n--- a\/packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/ProfilingImportExportButtons.js\n+++ b\/packages\/react-devtools-shared\/src\/devtools\/views\/Profiler\/ProfilingImportExportButtons.js\n@@ -19,7 +19,7 @@ import {\n prepareProfilingDataFrontendFromExport,\n } from '.\/utils';\n import {downloadFile} from '..\/utils';\n-import {SchedulingProfilerContext} from 'react-devtools-timeline\/src\/SchedulingProfilerContext';\n+import {TimelineContext} from 'react-devtools-timeline\/src\/TimelineContext';\n \n import styles from '.\/ProfilingImportExportButtons.css';\n \n@@ -29,7 +29,7 @@ export default function ProfilingImportExportButtons() {\n const {isProfiling, profilingData, rootID, selectedTabID} = useContext(\n ProfilerContext,\n );\n- const {importSchedulingProfilerData} = useContext(SchedulingProfilerContext);\n+ const {importTimelineData} = useContext(TimelineContext);\n const store = useContext(StoreContext);\n const {profilerStore} = store;\n \n@@ -108,10 +108,10 @@ export default function ProfilingImportExportButtons() {\n }\n }, [modalDialogDispatch, profilerStore]);\n \n- const importSchedulingProfilerDataWrapper = event => {\n+ const importTimelineDataWrapper = event => {\n const input = inputRef.current;\n if (input !== null && input.files.length > 0) {\n- importSchedulingProfilerData(input.files[0]);\n+ importTimelineData(input.files[0]);\n }\n };\n \n@@ -124,7 +124,7 @@ export default function ProfilingImportExportButtons() {\n type=\"file\"\n onChange={\n selectedTabID === 'timeline'\n- ? importSchedulingProfilerDataWrapper\n+ ? importTimelineDataWrapper\n : importProfilerData\n }\n tabIndex={-1}\ndiff --git a\/packages\/react-devtools-timeline\/src\/SchedulingProfiler.css b\/packages\/react-devtools-timeline\/src\/Timeline.css\nsimilarity index 100%\nrename from packages\/react-devtools-timeline\/src\/SchedulingProfiler.css\nrename to packages\/react-devtools-timeline\/src\/Timeline.css\ndiff --git a\/packages\/react-devtools-timeline\/src\/SchedulingProfiler.js b\/packages\/react-devtools-timeline\/src\/Timeline.js\nsimilarity index 89%\nrename from packages\/react-devtools-timeline\/src\/SchedulingProfiler.js\nrename to packages\/react-devtools-timeline\/src\/Timeline.js\nindex 98cd61d312..4b6d21f8a8 100644\n--- a\/packages\/react-devtools-timeline\/src\/SchedulingProfiler.js\n+++ b\/packages\/react-devtools-timeline\/src\/Timeline.js\n@@ -21,18 +21,16 @@ import {\n } from 'react';\n import {SettingsContext} from 'react-devtools-shared\/src\/devtools\/views\/Settings\/SettingsContext';\n import {updateColorsToMatchTheme} from '.\/content-views\/constants';\n-import {SchedulingProfilerContext} from '.\/SchedulingProfilerContext';\n+import {TimelineContext} from '.\/TimelineContext';\n import ImportButton from '.\/ImportButton';\n import CanvasPage from '.\/CanvasPage';\n \n-import styles from '.\/SchedulingProfiler.css';\n+import styles from '.\/Timeline.css';\n \n-export function SchedulingProfiler(_: {||}) {\n- const {\n- importSchedulingProfilerData,\n- schedulingProfilerData,\n- viewState,\n- } = useContext(SchedulingProfilerContext);\n+export function Timeline(_: {||}) {\n+ const {importTimelineData, timelineData, viewState} = useContext(\n+ TimelineContext,\n+ );\n \n const ref = useRef(null);\n \n@@ -63,17 +61,17 @@ export function SchedulingProfiler(_: {||}) {\n \n return (\n

\n- {schedulingProfilerData ? (\n+ {timelineData ? (\n }>\n \n <\/Suspense>\n ) : (\n- \n+ \n )}\n <\/div>\n );\ndiff --git a\/packages\/react-devtools-timeline\/src\/SchedulingProfilerContext.js b\/packages\/react-devtools-timeline\/src\/TimelineContext.js\nsimilarity index 60%\nrename from packages\/react-devtools-timeline\/src\/SchedulingProfilerContext.js\nrename to packages\/react-devtools-timeline\/src\/TimelineContext.js\nindex ff81482c09..ebfac421e2 100644\n--- a\/packages\/react-devtools-timeline\/src\/SchedulingProfilerContext.js\n+++ b\/packages\/react-devtools-timeline\/src\/TimelineContext.js\n@@ -15,33 +15,28 @@ import type {HorizontalScrollStateChangeCallback, ViewState} from '.\/types';\n import type {DataResource} from '.\/createDataResourceFromImportedFile';\n \n export type Context = {|\n- clearSchedulingProfilerData: () => void,\n- importSchedulingProfilerData: (file: File) => void,\n- schedulingProfilerData: DataResource | null,\n+ clearTimelineData: () => void,\n+ importTimelineData: (file: File) => void,\n+ timelineData: DataResource | null,\n viewState: ViewState,\n |};\n \n-const SchedulingProfilerContext = createContext(\n- ((null: any): Context),\n-);\n-SchedulingProfilerContext.displayName = 'SchedulingProfilerContext';\n+const TimelineContext = createContext(((null: any): Context));\n+TimelineContext.displayName = 'TimelineContext';\n \n type Props = {|\n children: React$Node,\n |};\n \n-function SchedulingProfilerContextController({children}: Props) {\n- const [\n- schedulingProfilerData,\n- setSchedulingProfilerData,\n- ] = useState(null);\n+function TimelineContextController({children}: Props) {\n+ const [timelineData, setTimelineData] = useState(null);\n \n- const clearSchedulingProfilerData = useCallback(() => {\n- setSchedulingProfilerData(null);\n+ const clearTimelineData = useCallback(() => {\n+ setTimelineData(null);\n }, []);\n \n- const importSchedulingProfilerData = useCallback((file: File) => {\n- setSchedulingProfilerData(createDataResourceFromImportedFile(file));\n+ const importTimelineData = useCallback((file: File) => {\n+ setTimelineData(createDataResourceFromImportedFile(file));\n }, []);\n \n \/\/ Recreate view state any time new profiling data is imported.\n@@ -75,28 +70,23 @@ function SchedulingProfilerContextController({children}: Props) {\n },\n viewToMutableViewStateMap: new Map(),\n };\n- }, [schedulingProfilerData]);\n+ }, [timelineData]);\n \n const value = useMemo(\n () => ({\n- clearSchedulingProfilerData,\n- importSchedulingProfilerData,\n- schedulingProfilerData,\n+ clearTimelineData,\n+ importTimelineData,\n+ timelineData,\n viewState,\n }),\n- [\n- clearSchedulingProfilerData,\n- importSchedulingProfilerData,\n- schedulingProfilerData,\n- viewState,\n- ],\n+ [clearTimelineData, importTimelineData, timelineData, viewState],\n );\n \n return (\n- \n+ \n {children}\n- <\/SchedulingProfilerContext.Provider>\n+ <\/TimelineContext.Provider>\n );\n }\n \n-export {SchedulingProfilerContext, SchedulingProfilerContextController};\n+export {TimelineContext, TimelineContextController};\n"}

dillon1000/react

Files changed