RPP: rename time unit types and constructors

- MicroSeconds to Micro
- MilliSeconds to Milli
- TraceWindowMicroSeconds to TraceWindowMicro
- TraceWindowMilliSeconds to TraceWindowMilli

Bug: none
Change-Id: I1e2ce7bacb985aba644f0d61d230338cec5e51a7
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6191870
Auto-Submit: Jack Franklin <[email protected]>
Reviewed-by: Nancy Li <[email protected]>
Commit-Queue: Nancy Li <[email protected]>
Commit-Queue: Jack Franklin <[email protected]>

Author: jackfranklin

front_end/core/sdk/TraceObject.test.ts

@@ -15,7 +15,7 @@ describe('TraceObject', () => {
         ph: Trace.Types.Events.Phase.COMPLETE,
         pid: Trace.Types.Events.ProcessID(1),
         tid: Trace.Types.Events.ThreadID(4),
-        ts: Trace.Types.Timing.MicroSeconds(5e7),
+        ts: Trace.Types.Timing.Micro(5e7),
         args: {
           data: {frame: '0xA'},
         },

front_end/models/trace/LanternComputationData.ts

@@ -23,14 +23,14 @@ function createProcessedNavigation(parsedTrace: Handlers.Types.ParsedTrace, fram
   }
 
   const getTimestampOrUndefined =
-      (metric: Handlers.ModelHandlers.PageLoadMetrics.MetricName): Types.Timing.MicroSeconds|undefined => {
+      (metric: Handlers.ModelHandlers.PageLoadMetrics.MetricName): Types.Timing.Micro|undefined => {
         const metricScore = scores.get(metric);
         if (!metricScore?.event) {
           return;
         }
         return metricScore.event.ts;
       };
-  const getTimestamp = (metric: Handlers.ModelHandlers.PageLoadMetrics.MetricName): Types.Timing.MicroSeconds => {
+  const getTimestamp = (metric: Handlers.ModelHandlers.PageLoadMetrics.MetricName): Types.Timing.Micro => {
     const metricScore = scores.get(metric);
     if (!metricScore?.event) {
       throw new Lantern.Core.LanternError(`missing metric: ${metric}`);

front_end/models/trace/ModelImpl.test.ts

@@ -113,9 +113,9 @@ describeWithEnvironment('TraceModel', function() {
 
     const initialBreadcrumb = {
       window: {
-        max: 0 as Trace.Types.Timing.MicroSeconds,
-        min: 10 as Trace.Types.Timing.MicroSeconds,
-        range: 10 as Trace.Types.Timing.MicroSeconds,
+        max: 0 as Trace.Types.Timing.Micro,
+        min: 10 as Trace.Types.Timing.Micro,
+        range: 10 as Trace.Types.Timing.Micro,
       },
       child: null,
     };
@@ -135,9 +135,9 @@ describeWithEnvironment('TraceModel', function() {
       labelledTimeRanges: [
         {
           bounds: {
-            min: Trace.Types.Timing.MicroSeconds(0),
-            max: Trace.Types.Timing.MicroSeconds(10),
-            range: Trace.Types.Timing.MicroSeconds(10),
+            min: Trace.Types.Timing.Micro(0),
+            max: Trace.Types.Timing.Micro(10),
+            range: Trace.Types.Timing.Micro(10),
           },
           label: 'range label',
         },

front_end/models/trace/Processor.ts

@@ -503,7 +503,7 @@ export class TraceProcessor extends EventTarget {
     if (navigations.length) {
       const bounds = Helpers.Timing.traceWindowFromMicroSeconds(parsedTrace.Meta.traceBounds.min, navigations[0].ts);
       // When using "Record and reload" option, it typically takes ~5ms. So use 50ms to be safe.
-      const threshold = Helpers.Timing.milliToMicro(50 as Types.Timing.MilliSeconds);
+      const threshold = Helpers.Timing.milliToMicro(50 as Types.Timing.Milli);
       if (bounds.range > threshold) {
         const context: Insights.Types.InsightSetContext = {
           bounds,

front_end/models/trace/extras/FilmStrip.test.ts

@@ -20,8 +20,8 @@ describeWithEnvironment('FilmStrip', function() {
     // It is from cache so you get back the exact same object.
     assert.strictEqual(filmStrip1, filmStrip2);
 
-    const filmStrip3 = Trace.Extras.FilmStrip.fromParsedTrace(parsedTrace, Trace.Types.Timing.MicroSeconds(0));
-    const filmStrip4 = Trace.Extras.FilmStrip.fromParsedTrace(parsedTrace, Trace.Types.Timing.MicroSeconds(5));
+    const filmStrip3 = Trace.Extras.FilmStrip.fromParsedTrace(parsedTrace, Trace.Types.Timing.Micro(0));
+    const filmStrip4 = Trace.Extras.FilmStrip.fromParsedTrace(parsedTrace, Trace.Types.Timing.Micro(5));
     // Not equal as the calls had different start times.
     assert.notStrictEqual(filmStrip3, filmStrip4);
   });
@@ -38,7 +38,7 @@ describeWithEnvironment('FilmStrip', function() {
     const {parsedTrace} = await TraceLoader.traceEngine(this, 'web-dev.json.gz');
     const filmStrip = Trace.Extras.FilmStrip.fromParsedTrace(parsedTrace);
     // Set a custom zero time after the first screenshot and ensure that we now only have four events.
-    const newCustomZeroTime = Trace.Types.Timing.MicroSeconds(filmStrip.frames[0].screenshotEvent.ts + 1000);
+    const newCustomZeroTime = Trace.Types.Timing.Micro(filmStrip.frames[0].screenshotEvent.ts + 1000);
     const newFilmStrip = Trace.Extras.FilmStrip.fromParsedTrace(parsedTrace, newCustomZeroTime);
     // Check that the new film strip is all the frames other than the first, now we have set a custom time.
     assert.deepEqual(newFilmStrip.frames.map(f => f.screenshotEvent.args.dataUri), [
@@ -55,14 +55,14 @@ describeWithEnvironment('FilmStrip', function() {
     const frameTimestamps = filmStrip.frames.map(frame => frame.screenshotEvent.ts);
     assert.deepEqual(frameTimestamps, [1020034823345, 1020034961883, 1020035045298, 1020035061981, 1020035112030]);
 
-    const timestampNearestFirstFrame = Trace.Types.Timing.MicroSeconds(frameTimestamps[0] + 10);
+    const timestampNearestFirstFrame = Trace.Types.Timing.Micro(frameTimestamps[0] + 10);
     assert.strictEqual(
         Trace.Extras.FilmStrip.frameClosestToTimestamp(filmStrip, timestampNearestFirstFrame), filmStrip.frames.at(0));
-    const timestampNearestThirdFrame = Trace.Types.Timing.MicroSeconds(frameTimestamps[2] + 10);
+    const timestampNearestThirdFrame = Trace.Types.Timing.Micro(frameTimestamps[2] + 10);
     assert.strictEqual(
         Trace.Extras.FilmStrip.frameClosestToTimestamp(filmStrip, timestampNearestThirdFrame), filmStrip.frames.at(2));
 
-    const timestampBeforeAnyFrames = Trace.Types.Timing.MicroSeconds(frameTimestamps[0] - 100);
+    const timestampBeforeAnyFrames = Trace.Types.Timing.Micro(frameTimestamps[0] - 100);
     assert.isNull(Trace.Extras.FilmStrip.frameClosestToTimestamp(filmStrip, timestampBeforeAnyFrames));
   });
 });

front_end/models/trace/extras/FilmStrip.ts

@@ -7,8 +7,8 @@ import type * as Handlers from '../handlers/handlers.js';
 import type * as Types from '../types/types.js';
 
 export interface Data {
-  zeroTime: Types.Timing.MicroSeconds;
-  spanTime: Types.Timing.MicroSeconds;
+  zeroTime: Types.Timing.Micro;
+  spanTime: Types.Timing.Micro;
   frames: readonly Frame[];
 }
 
@@ -30,10 +30,9 @@ export type HandlerDataWithScreenshots = Handlers.Types.EnabledHandlerDataWithMe
 // Cache film strips based on:
 // 1. The trace parsed data object
 // 2. The start time.
-const filmStripCache = new WeakMap<HandlerDataWithScreenshots, Map<Types.Timing.MicroSeconds, Data>>();
+const filmStripCache = new WeakMap<HandlerDataWithScreenshots, Map<Types.Timing.Micro, Data>>();
 
-export function fromParsedTrace(
-    parsedTrace: HandlerDataWithScreenshots, customZeroTime?: Types.Timing.MicroSeconds): Data {
+export function fromParsedTrace(parsedTrace: HandlerDataWithScreenshots, customZeroTime?: Types.Timing.Micro): Data {
   const frames: Frame[] = [];
 
   const zeroTime = typeof customZeroTime !== 'undefined' ? customZeroTime : parsedTrace.Meta.traceBounds.min;
@@ -60,14 +59,14 @@ export function fromParsedTrace(
     frames: Array.from(frames),
   };
 
-  const cachedForData = Platform.MapUtilities.getWithDefault(
-      filmStripCache, parsedTrace, () => new Map<Types.Timing.MicroSeconds, Data>());
+  const cachedForData =
+      Platform.MapUtilities.getWithDefault(filmStripCache, parsedTrace, () => new Map<Types.Timing.Micro, Data>());
   cachedForData.set(zeroTime, result);
 
   return result;
 }
 
-export function frameClosestToTimestamp(filmStrip: Data, searchTimestamp: Types.Timing.MicroSeconds): Frame|null {
+export function frameClosestToTimestamp(filmStrip: Data, searchTimestamp: Types.Timing.Micro): Frame|null {
   const closestFrameIndexBeforeTimestamp = Platform.ArrayUtilities.nearestIndexFromEnd(
       filmStrip.frames, frame => frame.screenshotEvent.ts < searchTimestamp);
   if (closestFrameIndexBeforeTimestamp === null) {

front_end/models/trace/extras/MainThreadActivity.test.ts

@@ -8,15 +8,15 @@ import {
 import * as Trace from '../trace.js';
 
 const DEVTOOLS_CATEGORY = 'disabled-by-default-devtools.timeline';
-function milliToMicro(x: number): Trace.Types.Timing.MicroSeconds {
-  return Trace.Helpers.Timing.milliToMicro(Trace.Types.Timing.MilliSeconds(x));
+function milliToMicro(x: number): Trace.Types.Timing.Micro {
+  return Trace.Helpers.Timing.milliToMicro(Trace.Types.Timing.Milli(x));
 }
 
-function makeFakeBounds(min: number, max: number): Trace.Types.Timing.TraceWindowMicroSeconds {
+function makeFakeBounds(min: number, max: number): Trace.Types.Timing.TraceWindowMicro {
   return {
-    min: Trace.Types.Timing.MicroSeconds(min),
-    max: Trace.Types.Timing.MicroSeconds(max),
-    range: Trace.Types.Timing.MicroSeconds(max - min),
+    min: Trace.Types.Timing.Micro(min),
+    max: Trace.Types.Timing.Micro(max),
+    range: Trace.Types.Timing.Micro(max - min),
   };
 }
 

front_end/models/trace/extras/MainThreadActivity.ts

@@ -11,8 +11,8 @@ const IDLE_FUNCTION_CALL_NAMES = new Set([
 ]);
 
 export function calculateWindow(
-    traceBounds: Types.Timing.TraceWindowMicroSeconds,
-    mainThreadEntries: readonly Types.Events.Event[]): Types.Timing.TraceWindowMicroSeconds {
+    traceBounds: Types.Timing.TraceWindowMicro,
+    mainThreadEntries: readonly Types.Events.Event[]): Types.Timing.TraceWindowMicro {
   if (!mainThreadEntries.length) {
     return traceBounds;
   }
@@ -75,12 +75,12 @@ export function calculateWindow(
   // we give the range we want to zoom a bit of breathing space. At the
   // same time, ensure that we do not stray beyond the bounds of the
   // min/max time of the entire trace.
-  leftTime = Types.Timing.MicroSeconds(Math.max(leftTime - 0.05 * zoomedInSpan, traceBounds.min));
-  rightTime = Types.Timing.MicroSeconds(Math.min(rightTime + 0.05 * zoomedInSpan, traceBounds.max));
+  leftTime = Types.Timing.Micro(Math.max(leftTime - 0.05 * zoomedInSpan, traceBounds.min));
+  rightTime = Types.Timing.Micro(Math.min(rightTime + 0.05 * zoomedInSpan, traceBounds.max));
 
   return {
     min: leftTime,
     max: rightTime,
-    range: Types.Timing.MicroSeconds(rightTime - leftTime),
+    range: Types.Timing.Micro(rightTime - leftTime),
   };
 }

front_end/models/trace/extras/ThirdParties.test.ts

@@ -53,9 +53,9 @@ describeWithEnvironment('ThirdParties', function() {
       const reqs = parsedTrace.NetworkRequests.byTime;
 
       // Font requests of load-simple.json.gz begin & end before/after this bounds.
-      const min = Trace.Types.Timing.MicroSeconds(1634222300000);
-      const max = Trace.Types.Timing.MicroSeconds(1634222320000);
-      const middle = {min, max, range: Trace.Types.Timing.MicroSeconds(max - min)};
+      const min = Trace.Types.Timing.Micro(1634222300000);
+      const max = Trace.Types.Timing.Micro(1634222320000);
+      const middle = {min, max, range: Trace.Types.Timing.Micro(max - min)};
 
       const {entityByRequest} =
           Trace.Extras.ThirdParties.getSummariesAndEntitiesForTraceBounds(parsedTrace, middle, reqs);
@@ -75,9 +75,9 @@ describeWithEnvironment('ThirdParties', function() {
       const {parsedTrace} = await TraceLoader.traceEngine(this, 'load-simple.json.gz');
       const reqs = parsedTrace.NetworkRequests.byTime;
 
-      const min = Trace.Types.Timing.MicroSeconds(1634230000000);
-      const max = Trace.Types.Timing.MicroSeconds(1634231000000);
-      const middle = {min, max, range: Trace.Types.Timing.MicroSeconds(max - min)};
+      const min = Trace.Types.Timing.Micro(1634230000000);
+      const max = Trace.Types.Timing.Micro(1634231000000);
+      const middle = {min, max, range: Trace.Types.Timing.Micro(max - min)};
 
       const {entityByRequest} =
           Trace.Extras.ThirdParties.getSummariesAndEntitiesForTraceBounds(parsedTrace, middle, reqs);

front_end/models/trace/extras/ThirdParties.ts

@@ -11,7 +11,7 @@ export type Entity = typeof ThirdPartyWeb.ThirdPartyWeb.entities[number];
 
 export interface Summary {
   transferSize: number;
-  mainThreadTime: Types.Timing.MicroSeconds;
+  mainThreadTime: Types.Timing.Micro;
 }
 
 export interface SummaryMaps {
@@ -21,7 +21,7 @@ export interface SummaryMaps {
 }
 
 function getSelfTimeByUrl(
-    parsedTrace: Handlers.Types.ParsedTrace, bounds: Types.Timing.TraceWindowMicroSeconds): Map<string, number> {
+    parsedTrace: Handlers.Types.ParsedTrace, bounds: Types.Timing.TraceWindowMicro): Map<string, number> {
   const selfTimeByUrl = new Map<string, number>();
 
   for (const process of parsedTrace.Renderer.processes.values()) {
@@ -79,13 +79,13 @@ function getSummaryMap(
     selfTimeByUrl: Map<string, number>): SummaryMaps {
   const byRequest = new Map<Types.Events.SyntheticNetworkRequest, Summary>();
   const byEntity = new Map<Entity, Summary>();
-  const defaultSummary: Summary = {transferSize: 0, mainThreadTime: Types.Timing.MicroSeconds(0)};
+  const defaultSummary: Summary = {transferSize: 0, mainThreadTime: Types.Timing.Micro(0)};
 
   for (const request of requests) {
     const urlSummary = byRequest.get(request) || {...defaultSummary};
     urlSummary.transferSize += request.args.data.encodedDataLength;
     urlSummary.mainThreadTime =
-        Types.Timing.MicroSeconds(urlSummary.mainThreadTime + (selfTimeByUrl.get(request.args.data.url) ?? 0));
+        Types.Timing.Micro(urlSummary.mainThreadTime + (selfTimeByUrl.get(request.args.data.url) ?? 0));
     byRequest.set(request, urlSummary);
   }
 
@@ -100,8 +100,7 @@ function getSummaryMap(
 
     const entitySummary = byEntity.get(entity) || {...defaultSummary};
     entitySummary.transferSize += requestSummary.transferSize;
-    entitySummary.mainThreadTime =
-        Types.Timing.MicroSeconds(entitySummary.mainThreadTime + requestSummary.mainThreadTime);
+    entitySummary.mainThreadTime = Types.Timing.Micro(entitySummary.mainThreadTime + requestSummary.mainThreadTime);
     byEntity.set(entity, entitySummary);
 
     const entityRequests = requestsByEntity.get(entity) || [];
@@ -113,7 +112,7 @@ function getSummaryMap(
 }
 
 export function getSummariesAndEntitiesForTraceBounds(
-    parsedTrace: Handlers.Types.ParsedTrace, traceBounds: Types.Timing.TraceWindowMicroSeconds,
+    parsedTrace: Handlers.Types.ParsedTrace, traceBounds: Types.Timing.TraceWindowMicro,
     networkRequests: Types.Events.SyntheticNetworkRequest[]): {
   summaries: SummaryMaps,
   entityByRequest: Map<Types.Events.SyntheticNetworkRequest, Entity>,
@@ -139,15 +138,15 @@ function getSummaryMapWithMapping(
     parsedTrace: Handlers.Types.ParsedTrace): SummaryMaps {
   const byEvent = new Map<Types.Events.Event, Summary>();
   const byEntity = new Map<Handlers.Helpers.Entity, Summary>();
-  const defaultSummary: Summary = {transferSize: 0, mainThreadTime: Types.Timing.MicroSeconds(0)};
+  const defaultSummary: Summary = {transferSize: 0, mainThreadTime: Types.Timing.Micro(0)};
 
   for (const event of events) {
     const url = Handlers.Helpers.getNonResolvedURL(event, parsedTrace) ?? '';
     const urlSummary = byEvent.get(event) || {...defaultSummary};
     if (Types.Events.isSyntheticNetworkRequest(event)) {
       urlSummary.transferSize += event.args.data.encodedDataLength;
     }
-    urlSummary.mainThreadTime = Types.Timing.MicroSeconds(urlSummary.mainThreadTime + (selfTimeByUrl.get(url) ?? 0));
+    urlSummary.mainThreadTime = Types.Timing.Micro(urlSummary.mainThreadTime + (selfTimeByUrl.get(url) ?? 0));
     byEvent.set(event, urlSummary);
   }
 
@@ -161,16 +160,15 @@ function getSummaryMapWithMapping(
 
     const entitySummary = byEntity.get(entity) || {...defaultSummary};
     entitySummary.transferSize += requestSummary.transferSize;
-    entitySummary.mainThreadTime =
-        Types.Timing.MicroSeconds(entitySummary.mainThreadTime + requestSummary.mainThreadTime);
+    entitySummary.mainThreadTime = Types.Timing.Micro(entitySummary.mainThreadTime + requestSummary.mainThreadTime);
     byEntity.set(entity, entitySummary);
   }
 
   return {byEntity, byEvent, eventsByEntity};
 }
 
 export function getSummariesAndEntitiesWithMapping(
-    parsedTrace: Handlers.Types.ParsedTrace, traceBounds: Types.Timing.TraceWindowMicroSeconds,
+    parsedTrace: Handlers.Types.ParsedTrace, traceBounds: Types.Timing.TraceWindowMicro,
     entityMapping: Handlers.Helpers.EntityMappings): {
   summaries: SummaryMaps,
   entityByEvent: Map<Types.Events.Event, Handlers.Helpers.Entity>,