Remove TimelineModel by moving TracingLayerTree into timeline

Change-Id: Ib3834ead748079304ced7635a7de98f51296727e
Bug: 358583420
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6277145
Reviewed-by: Jack Franklin <[email protected]>
Auto-Submit: Paul Irish <[email protected]>
Commit-Queue: Jack Franklin <[email protected]>

Author: paulirish

config/gni/devtools_grd_files.gni

@@ -571,7 +571,6 @@ grd_files_release_sources = [
   "front_end/models/project_settings/project_settings.js",
   "front_end/models/source_map_scopes/source_map_scopes.js",
   "front_end/models/text_utils/text_utils.js",
-  "front_end/models/timeline_model/timeline_model.js",
   "front_end/models/trace/extras/extras.js",
   "front_end/models/trace/handlers/handlers.js",
   "front_end/models/trace/helpers/helpers.js",
@@ -1083,7 +1082,6 @@ grd_files_debug_sources = [
   "front_end/models/text_utils/TextRange.js",
   "front_end/models/text_utils/TextUtils.js",
   "front_end/models/text_utils/WasmDisassembly.js",
-  "front_end/models/timeline_model/TracingLayerTree.js",
   "front_end/models/trace/LanternComputationData.js",
   "front_end/models/trace/ModelImpl.js",
   "front_end/models/trace/Processor.js",
@@ -1872,6 +1870,7 @@ grd_files_debug_sources = [
   "front_end/panels/timeline/TimelineTreeView.js",
   "front_end/panels/timeline/TimelineUIUtils.js",
   "front_end/panels/timeline/TimingsTrackAppender.js",
+  "front_end/panels/timeline/TracingLayerTree.js",
   "front_end/panels/timeline/UIDevtoolsController.js",
   "front_end/panels/timeline/UIDevtoolsUtils.js",
   "front_end/panels/timeline/components/Breadcrumbs.js",

front_end/models/cpu_profile/BUILD.gn

@@ -31,7 +31,6 @@ devtools_entrypoint("bundle") {
     "../../panels/timeline/*",
     "../../testing/*",
     "../../ui/legacy/components/perf_ui/*",
-    "../timeline_model/*",
     "../trace/*",
   ]
 }

front_end/models/timeline_model/BUILD.gn

@@ -18,6 +18,7 @@ devtools_module("trace") {
   deps = [
     "../../core/common:bundle",
     "../../core/platform:bundle",
+    "../../core/root:bundle",
     "../../core/sdk:bundle",
     "../../generated:protocol",
     "../cpu_profile:bundle",
@@ -51,7 +52,6 @@ devtools_entrypoint("bundle") {
     "../../testing/*",
     "../../ui/components/docs/*",
     "../../ui/legacy/components/utils/*",
-    "../timeline_model/*",
     "./*",
   ]
 

front_end/models/timeline_model/OWNERS

@@ -95,6 +95,7 @@ devtools_module("timeline") {
     "TimelineTreeView.ts",
     "TimelineUIUtils.ts",
     "TimingsTrackAppender.ts",
+    "TracingLayerTree.ts",
     "UIDevtoolsController.ts",
     "UIDevtoolsUtils.ts",
   ]
@@ -107,7 +108,6 @@ devtools_module("timeline") {
     "../../models/cpu_profile:bundle",
     "../../models/extensions:bundle",
     "../../models/source_map_scopes:bundle",
-    "../../models/timeline_model:bundle",
     "../../models/trace:bundle",
     "../../models/workspace:bundle",
     "../../panels/coverage:bundle",
@@ -213,7 +213,6 @@ ts_library("unittests") {
     "../../core/root:bundle",
     "../../core/sdk:bundle",
     "../../models/bindings:bundle",
-    "../../models/timeline_model:bundle",
     "../../models/trace:bundle",
     "../../models/workspace:bundle",
     "../../testing",

front_end/models/timeline_model/timeline_model.ts

@@ -5,7 +5,6 @@
 import * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as SDK from '../../core/sdk/sdk.js';
-import * as TimelineModel from '../../models/timeline_model/timeline_model.js';
 import * as Trace from '../../models/trace/trace.js';
 import * as TraceBounds from '../../services/trace_bounds/trace_bounds.js';
 import * as Components from '../../ui/legacy/components/utils/utils.js';
@@ -29,6 +28,7 @@ import {
 import {TimelineSelectorStatsView} from './TimelineSelectorStatsView.js';
 import {BottomUpTimelineTreeView, CallTreeTimelineTreeView, TimelineTreeView} from './TimelineTreeView.js';
 import {TimelineUIUtils} from './TimelineUIUtils.js';
+import {TracingFrameLayerTree} from './TracingLayerTree.js';
 import * as Utils from './utils/utils.js';
 
 const UIStrings = {
@@ -365,7 +365,7 @@ export class TimelineDetailsPane extends
         TimelineUIUtils.generateDetailsContentForFrame(frame, this.#filmStrip, matchedFilmStripFrame));
     const target = SDK.TargetManager.TargetManager.instance().rootTarget();
     if (frame.layerTree && target) {
-      const layerTreeForFrame = new TimelineModel.TracingLayerTree.TracingFrameLayerTree(target, frame.layerTree);
+      const layerTreeForFrame = new TracingFrameLayerTree(target, frame.layerTree);
       const layersView = this.layersView();
       layersView.showLayerTree(layerTreeForFrame);
       if (!this.tabbedPane.hasTab(Tab.LayerViewer)) {

front_end/models/trace/BUILD.gn

@@ -4,16 +4,17 @@
 
 import type * as Common from '../../core/common/common.js';
 import type * as SDK from '../../core/sdk/sdk.js';
-import type * as TimelineModel from '../../models/timeline_model/timeline_model.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import * as LayerViewer from '../layer_viewer/layer_viewer.js';
 
+import type {TracingFrameLayerTree} from './TracingLayerTree.js';
+
 export class TimelineLayersView extends UI.SplitWidget.SplitWidget {
   private readonly showPaintProfilerCallback: (arg0: SDK.PaintProfiler.PaintProfilerSnapshot) => void;
   private readonly rightSplitWidget: UI.SplitWidget.SplitWidget;
   private readonly layerViewHost: LayerViewer.LayerViewHost.LayerViewHost;
   private readonly layers3DView: LayerViewer.Layers3DView.Layers3DView;
-  private frameLayerTree?: TimelineModel.TracingLayerTree.TracingFrameLayerTree;
+  private frameLayerTree?: TracingFrameLayerTree;
   private updateWhenVisible?: boolean;
   constructor(showPaintProfilerCallback: (arg0: SDK.PaintProfiler.PaintProfilerSnapshot) => void) {
     super(true, false, 'timeline-layers-view');
@@ -43,7 +44,7 @@ export class TimelineLayersView extends UI.SplitWidget.SplitWidget {
         LayerViewer.LayerDetailsView.Events.PAINT_PROFILER_REQUESTED, this.onPaintProfilerRequested, this);
   }
 
-  showLayerTree(frameLayerTree: TimelineModel.TracingLayerTree.TracingFrameLayerTree): void {
+  showLayerTree(frameLayerTree: TracingFrameLayerTree): void {
     this.frameLayerTree = frameLayerTree;
     if (this.isShowing()) {
       this.update();

front_end/panels/timeline/BUILD.gn

@@ -4,12 +4,12 @@
 
 import * as SDK from '../../core/sdk/sdk.js';
 import type * as Protocol from '../../generated/protocol.js';
-import * as TimelineModel from '../../models/timeline_model/timeline_model.js';
 import * as Trace from '../../models/trace/trace.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import * as LayerViewer from '../layer_viewer/layer_viewer.js';
 
 import timelinePaintProfilerStyles from './timelinePaintProfiler.css.js';
+import {TracingFrameLayerTree} from './TracingLayerTree.js';
 
 export class TimelinePaintProfilerView extends UI.SplitWidget.SplitWidget {
   private readonly logAndImageSplitWidget: UI.SplitWidget.SplitWidget;
@@ -129,7 +129,7 @@ export class TimelinePaintProfilerView extends UI.SplitWidget.SplitWidget {
       return null;
     }
 
-    const layerTree = new TimelineModel.TracingLayerTree.TracingFrameLayerTree(
+    const layerTree = new TracingFrameLayerTree(
         target,
         frame.layerTree,
     );