diff --git a/components/profile/time.rs b/components/profile/time.rs index 9aaa4ef0023..35f3ea65a47 100644 --- a/components/profile/time.rs +++ b/components/profile/time.rs @@ -76,19 +76,12 @@ impl Formattable for ProfilerCategory { let padding = match *self { ProfilerCategory::LayoutStyleRecalc | ProfilerCategory::LayoutRestyleDamagePropagation | - ProfilerCategory::LayoutNonIncrementalReset | ProfilerCategory::LayoutGeneratedContent | - ProfilerCategory::LayoutDisplayListSorting | ProfilerCategory::LayoutFloatPlacementSpeculation | ProfilerCategory::LayoutMain | ProfilerCategory::LayoutStoreOverflow | ProfilerCategory::LayoutDispListBuild | - ProfilerCategory::LayoutDamagePropagate | - ProfilerCategory::PaintingPerTile | - ProfilerCategory::PaintingPrepBuff => "+ ", ProfilerCategory::LayoutParallelWarmup | - ProfilerCategory::LayoutSelectorMatch | - ProfilerCategory::LayoutTreeBuilder | ProfilerCategory::LayoutTextShaping => "| + ", _ => "", }; @@ -98,22 +91,12 @@ impl Formattable for ProfilerCategory { ProfilerCategory::LayoutStyleRecalc => "Style Recalc", ProfilerCategory::LayoutTextShaping => "Text Shaping", ProfilerCategory::LayoutRestyleDamagePropagation => "Restyle Damage Propagation", - ProfilerCategory::LayoutNonIncrementalReset => "Non-incremental reset (temporary)", - ProfilerCategory::LayoutSelectorMatch => "Selector Matching", - ProfilerCategory::LayoutTreeBuilder => "Tree Building", - ProfilerCategory::LayoutDamagePropagate => "Damage Propagation", - ProfilerCategory::LayoutDisplayListSorting => "Sorting Display List", ProfilerCategory::LayoutGeneratedContent => "Generated Content Resolution", ProfilerCategory::LayoutFloatPlacementSpeculation => "Float Placement Speculation", ProfilerCategory::LayoutMain => "Primary Layout Pass", ProfilerCategory::LayoutStoreOverflow => "Store Overflow", ProfilerCategory::LayoutParallelWarmup => "Parallel Warmup", ProfilerCategory::LayoutDispListBuild => "Display List Construction", - ProfilerCategory::NetHTTPRequestResponse => "Network HTTP Request/Response", - ProfilerCategory::PaintingPerTile => "Painting Per Tile", - ProfilerCategory::PaintingPrepBuff => "Buffer Prep", - ProfilerCategory::Painting => "Painting", - ProfilerCategory::ImageDecoding => "Image Decoding", ProfilerCategory::ImageSaving => "Image Saving", ProfilerCategory::ScriptAttachLayout => "Script Attach Layout", ProfilerCategory::ScriptConstellationMsg => "Script Constellation Msg", @@ -142,7 +125,6 @@ impl Formattable for ProfilerCategory { ProfilerCategory::ScriptServiceWorkerEvent => "Script Service Worker Event", ProfilerCategory::ScriptEnterFullscreen => "Script Enter Fullscreen", ProfilerCategory::ScriptExitFullscreen => "Script Exit Fullscreen", - ProfilerCategory::ScriptWebVREvent => "Script WebVR Event", ProfilerCategory::ScriptWorkletEvent => "Script Worklet Event", ProfilerCategory::ScriptPerformanceEvent => "Script Performance Event", ProfilerCategory::ScriptWebGPUMsg => "Script WebGPU Message", diff --git a/components/shared/profile/time.rs b/components/shared/profile/time.rs index ec3b1a734d9..f30ee4a323d 100644 --- a/components/shared/profile/time.rs +++ b/components/shared/profile/time.rs @@ -60,25 +60,18 @@ pub enum ProfilerMsg { pub enum ProfilerCategory { Compositing = 0x00, LayoutPerform = 0x10, + + /// Events currently only used by Layout 2013. LayoutStyleRecalc = 0x11, LayoutTextShaping = 0x12, LayoutRestyleDamagePropagation = 0x13, - LayoutNonIncrementalReset = 0x14, - LayoutSelectorMatch = 0x15, - LayoutTreeBuilder = 0x16, - LayoutDamagePropagate = 0x17, LayoutGeneratedContent = 0x18, - LayoutDisplayListSorting = 0x19, LayoutFloatPlacementSpeculation = 0x1a, LayoutMain = 0x1b, LayoutStoreOverflow = 0x1c, LayoutParallelWarmup = 0x1d, LayoutDispListBuild = 0x1e, - NetHTTPRequestResponse = 0x30, - PaintingPerTile = 0x41, - PaintingPrepBuff = 0x42, - Painting = 0x43, - ImageDecoding = 0x50, + ImageSaving = 0x51, ScriptAttachLayout = 0x60, ScriptConstellationMsg = 0x61, @@ -111,15 +104,17 @@ pub enum ProfilerCategory { ScriptEnterFullscreen = 0x77, ScriptExitFullscreen = 0x78, - ScriptWebVREvent = 0x79, ScriptWorkletEvent = 0x7a, ScriptPerformanceEvent = 0x7b, ScriptHistoryEvent = 0x7c, ScriptPortMessage = 0x7d, ScriptWebGPUMsg = 0x7e, + + /// Web performance metrics. TimeToFirstPaint = 0x80, TimeToFirstContentfulPaint = 0x81, TimeToInteractive = 0x82, + IpcReceiver = 0x83, IpcBytesReceiver = 0x84, } @@ -132,22 +127,12 @@ impl ProfilerCategory { ProfilerCategory::LayoutStyleRecalc => "LayoutStyleRecalc", ProfilerCategory::LayoutTextShaping => "LayoutTextShaping", ProfilerCategory::LayoutRestyleDamagePropagation => "LayoutRestyleDamagePropagation", - ProfilerCategory::LayoutNonIncrementalReset => "LayoutNonIncrementalReset", - ProfilerCategory::LayoutSelectorMatch => "LayoutSelectorMatch", - ProfilerCategory::LayoutTreeBuilder => "LayoutTreeBuilder", - ProfilerCategory::LayoutDamagePropagate => "LayoutDamagePropagate", ProfilerCategory::LayoutGeneratedContent => "LayoutGeneratedContent", - ProfilerCategory::LayoutDisplayListSorting => "LayoutDisplayListSorting", ProfilerCategory::LayoutFloatPlacementSpeculation => "LayoutFloatPlacementSpeculation", ProfilerCategory::LayoutMain => "LayoutMain", ProfilerCategory::LayoutStoreOverflow => "LayoutStoreOverflow", ProfilerCategory::LayoutParallelWarmup => "LayoutParallelWarmup", ProfilerCategory::LayoutDispListBuild => "LayoutDispListBuild", - ProfilerCategory::NetHTTPRequestResponse => "NetHTTPRequestResponse", - ProfilerCategory::PaintingPerTile => "PaintingPerTile", - ProfilerCategory::PaintingPrepBuff => "PaintingPrepBuff", - ProfilerCategory::Painting => "Painting", - ProfilerCategory::ImageDecoding => "ImageDecoding", ProfilerCategory::ImageSaving => "ImageSaving", ProfilerCategory::ScriptAttachLayout => "ScriptAttachLayout", ProfilerCategory::ScriptConstellationMsg => "ScriptConstellationMsg", @@ -174,7 +159,6 @@ impl ProfilerCategory { ProfilerCategory::ScriptParseXML => "ScriptParseXML", ProfilerCategory::ScriptEnterFullscreen => "ScriptEnterFullscreen", ProfilerCategory::ScriptExitFullscreen => "ScriptExitFullscreen", - ProfilerCategory::ScriptWebVREvent => "ScriptWebVREvent", ProfilerCategory::ScriptWorkletEvent => "ScriptWorkletEvent", ProfilerCategory::ScriptPerformanceEvent => "ScriptPerformanceEvent", ProfilerCategory::ScriptHistoryEvent => "ScriptHistoryEvent",