chrome-devtools-frontend 1.0.943182 → 1.0.944903

package/front_end/panels/sources/UISourceCodeFrame.ts

@@ -70,13 +70,11 @@ export class UISourceCodeFrame extends
         SourceFrame.SourceFrame.SourceFrameImpl) {
   private uiSourceCodeInternal: Workspace.UISourceCode.UISourceCode;
   private muteSourceCodeEvents: boolean;
-  private isSettingContent: boolean;
   private persistenceBinding: Persistence.Persistence.PersistenceBinding|null;
   private uiSourceCodeEventListeners: Common.EventTarget.EventDescriptor[];
   private messageAndDecorationListeners: Common.EventTarget.EventDescriptor[];
   private readonly boundOnBindingChanged: () => void;
   private plugins: Plugin[] = [];
-  private pluginsLoaded = false;
   private readonly errorPopoverHelper: UI.PopoverHelper.PopoverHelper;
 
   constructor(uiSourceCode: Workspace.UISourceCode.UISourceCode) {
@@ -84,7 +82,6 @@ export class UISourceCodeFrame extends
     this.uiSourceCodeInternal = uiSourceCode;
 
     this.muteSourceCodeEvents = false;
-    this.isSettingContent = false;
 
     this.persistenceBinding = Persistence.Persistence.PersistenceImpl.instance().binding(uiSourceCode);
 
@@ -162,27 +159,24 @@ export class UISourceCodeFrame extends
   }
 
   setUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode): void {
-    this.unloadUISourceCode();
-    this.uiSourceCodeInternal = uiSourceCode;
-    if (uiSourceCode.contentLoaded()) {
+    const loaded = uiSourceCode.contentLoaded() ? Promise.resolve() : uiSourceCode.requestContent();
+    const startUISourceCode = this.uiSourceCodeInternal;
+    loaded.then(() => {
+      if (this.uiSourceCodeInternal !== startUISourceCode) {
+        return;
+      }
+      this.unloadUISourceCode();
+      this.uiSourceCodeInternal = uiSourceCode;
       if (uiSourceCode.workingCopy() !== this.textEditor.state.doc.toString()) {
-        this.innerSetContent(uiSourceCode.workingCopy());
+        this.setContent(uiSourceCode.workingCopy());
+      } else {
+        this.reloadPlugins();
       }
-    } else {
-      uiSourceCode.requestContent().then(() => {
-        if (this.uiSourceCodeInternal !== uiSourceCode) {
-          return;
-        }
-        if (uiSourceCode.workingCopy() !== this.textEditor.state.doc.toString()) {
-          this.innerSetContent(uiSourceCode.workingCopy());
-        }
-      });
-    }
-    this.initializeUISourceCode();
+      this.initializeUISourceCode();
+    }, console.error);
   }
 
   private unloadUISourceCode(): void {
-    this.disposePlugins();
     Common.EventTarget.removeEventListeners(this.messageAndDecorationListeners);
     Common.EventTarget.removeEventListeners(this.uiSourceCodeEventListeners);
     this.uiSourceCodeInternal.removeWorkingCopyGetter();
@@ -212,9 +206,6 @@ export class UISourceCodeFrame extends
   wasShown(): void {
     super.wasShown();
     this.setEditable(this.canEditSourceInternal());
-    for (const plugin of this.plugins) {
-      plugin.wasShown();
-    }
   }
 
   willHide(): void {
@@ -277,16 +268,12 @@ export class UISourceCodeFrame extends
 
   async setContent(content: string): Promise<void> {
     this.disposePlugins();
-    this.ensurePluginsLoaded();
+    this.loadPlugins();
     await super.setContent(content);
-    Common.EventTarget.fireEvent('source-file-loaded', this.uiSourceCodeInternal.displayName(true));
-  }
-
-  protected editorInitialized(): void {
-    super.editorInitialized();
     for (const plugin of this.plugins) {
       plugin.editorInitialized(this.textEditor);
     }
+    Common.EventTarget.fireEvent('source-file-loaded', this.uiSourceCodeInternal.displayName(true));
   }
 
   private allMessages(): Set<Workspace.UISourceCode.Message> {
@@ -302,9 +289,6 @@ export class UISourceCodeFrame extends
     const wasPretty = this.pretty;
     super.onTextChanged();
     this.errorPopoverHelper.hidePopover();
-    if (this.isSettingContent) {
-      return;
-    }
     SourcesPanel.instance().updateLastModificationTime();
     this.muteSourceCodeEvents = true;
     if (this.isClean()) {
@@ -323,12 +307,12 @@ export class UISourceCodeFrame extends
     if (this.muteSourceCodeEvents) {
       return;
     }
-    this.innerSetContent(this.uiSourceCodeInternal.workingCopy());
+    this.maybeSetContent(this.uiSourceCodeInternal.workingCopy());
   }
 
   private onWorkingCopyCommitted(): void {
     if (!this.muteSourceCodeEvents) {
-      this.innerSetContent(this.uiSourceCode().workingCopy());
+      this.maybeSetContent(this.uiSourceCode().workingCopy());
     }
     this.contentCommitted();
     this.updateStyle();
@@ -336,7 +320,7 @@ export class UISourceCodeFrame extends
 
   private reloadPlugins(): void {
     this.disposePlugins();
-    this.ensurePluginsLoaded();
+    this.loadPlugins();
     const editor = this.textEditor;
     editor.dispatch({effects: pluginCompartment.reconfigure(this.plugins.map(plugin => plugin.editorExtension()))});
     for (const plugin of this.plugins) {
@@ -348,12 +332,7 @@ export class UISourceCodeFrame extends
     this.updateLanguageMode('').then(() => this.reloadPlugins(), console.error);
   }
 
-  private ensurePluginsLoaded(): void {
-    if (this.pluginsLoaded) {
-      return;
-    }
-    this.pluginsLoaded = true;
-
+  private loadPlugins(): void {
     const binding = Persistence.Persistence.PersistenceImpl.instance().binding(this.uiSourceCodeInternal);
     const pluginUISourceCode = binding ? binding.network : this.uiSourceCodeInternal;
 
@@ -364,9 +343,6 @@ export class UISourceCodeFrame extends
     }
 
     this.dispatchEventToListeners(Events.ToolbarItemsChanged);
-    for (const plugin of this.plugins) {
-      plugin.wasShown();
-    }
   }
 
   private disposePlugins(): void {
@@ -374,7 +350,6 @@ export class UISourceCodeFrame extends
       plugin.dispose();
     }
     this.plugins = [];
-    this.pluginsLoaded = false;
   }
 
   private onBindingChanged(): void {
@@ -385,19 +360,17 @@ export class UISourceCodeFrame extends
     this.unloadUISourceCode();
     this.persistenceBinding = binding;
     this.initializeUISourceCode();
+    this.reloadPlugins();
   }
 
   private updateStyle(): void {
     this.setEditable(this.canEditSourceInternal());
   }
 
-  private innerSetContent(content: string): void {
-    this.isSettingContent = true;
-    const oldContent = this.textEditor.state.doc.toString();
-    if (oldContent !== content) {
+  private maybeSetContent(content: string): void {
+    if (this.textEditor.state.doc.toString() !== content) {
       this.setContent(content);
     }
-    this.isSettingContent = false;
   }
 
   protected populateTextAreaContextMenu(
@@ -407,7 +380,6 @@ export class UISourceCodeFrame extends
     const location = this.editorLocationToUILocation(lineNumber, columnNumber);
     contextMenu.appendApplicableItems(
         new Workspace.UISourceCode.UILocation(this.uiSourceCodeInternal, location.lineNumber, location.columnNumber));
-    contextMenu.appendApplicableItems(this);
     for (const plugin of this.plugins) {
       plugin.populateTextAreaContextMenu(contextMenu, lineNumber, columnNumber);
     }
@@ -422,6 +394,7 @@ export class UISourceCodeFrame extends
 
   dispose(): void {
     this.errorPopoverHelper.dispose();
+    this.disposePlugins();
     this.unloadUISourceCode();
     this.textEditor.editor.destroy();
     this.detach();

package/front_end/panels/timeline/TimelineController.ts

@@ -93,9 +93,6 @@ export class TimelineController implements SDK.TargetManager.SDKModelObserver<SD
     ];
     categoriesArray.push(TimelineModel.TimelineModel.TimelineModelImpl.Category.LatencyInfo);
 
-    if (Root.Runtime.experiments.isEnabled('timelineV8RuntimeCallStats') && options.enableJSSampling) {
-      categoriesArray.push(disabledByDefault('v8.runtime_stats_sampling'));
-    }
     if (!Root.Runtime.Runtime.queryParam('timelineTracingJSProfileDisabled') && options.enableJSSampling) {
       categoriesArray.push(disabledByDefault('v8.cpu_profiler'));
     }

package/front_end/panels/timeline/TimelineFlameChartDataProvider.ts

@@ -46,7 +46,7 @@ import type {PerformanceModel} from './PerformanceModel.js';
 import {FlameChartStyle, Selection, TimelineFlameChartMarker} from './TimelineFlameChartView.js';
 import {TimelineSelection} from './TimelinePanel.js';
 import type {TimelineCategory} from './TimelineUIUtils.js';
-import {TimelineUIUtils} from './TimelineUIUtils.js';
+import {TimelineUIUtils, assignLayoutShiftsToClusters} from './TimelineUIUtils.js';
 
 const UIStrings = {
   /**
@@ -768,7 +768,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
 
     const metricEvents: SDK.TracingModel.Event[] = [];
     const lcpEvents = [];
-    const layoutShifts = [];
+    const layoutShifts: SDK.TracingModel.Event[] = [];
     const timelineModel = this.performanceModel.timelineModel();
     for (const track of this.model.tracks()) {
       for (const event of track.events) {
@@ -807,38 +807,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     }
 
     if (layoutShifts.length) {
-      const gapTimeInMs = 1000;
-      const limitTimeInMs = 5000;
-      let firstTimestamp = Number.NEGATIVE_INFINITY;
-      let previousTimestamp = Number.NEGATIVE_INFINITY;
-      let maxScore = 0;
-      let currentClusterId = 1;
-      let currentClusterScore = 0;
-      let currentCluster = new Set<SDK.TracingModel.Event>();
-
-      for (const e of layoutShifts) {
-        if (e.args['data']['had_recent_input'] || e.args['data']['weighted_score_delta'] === undefined) {
-          continue;
-        }
-
-        if (e.startTime - firstTimestamp > limitTimeInMs || e.startTime - previousTimestamp > gapTimeInMs) {
-          firstTimestamp = e.startTime;
-
-          for (const layoutShift of currentCluster) {
-            layoutShift.args['data']['_current_cluster_score'] = currentClusterScore;
-            layoutShift.args['data']['_current_cluster_id'] = currentClusterId;
-          }
-
-          currentClusterId += 1;
-          currentClusterScore = 0;
-          currentCluster = new Set();
-        }
-
-        previousTimestamp = e.startTime;
-        currentClusterScore += e.args['data']['weighted_score_delta'];
-        currentCluster.add(e);
-        maxScore = Math.max(maxScore, currentClusterScore);
-      }
+      assignLayoutShiftsToClusters(layoutShifts);
     }
 
     metricEvents.sort(SDK.TracingModel.Event.compareStartTime);

package/front_end/panels/timeline/TimelineUIUtils.ts

@@ -2421,9 +2421,13 @@ export class TimelineUIUtils {
         contentHelper.appendTextRow(i18nString(UIStrings.score), eventData['score'].toPrecision(4));
         contentHelper.appendTextRow(
             i18nString(UIStrings.cumulativeScore), eventData['cumulative_score'].toPrecision(4));
-        contentHelper.appendTextRow(i18nString(UIStrings.currentClusterId), eventData['_current_cluster_id']);
-        contentHelper.appendTextRow(
-            i18nString(UIStrings.currentClusterScore), eventData['_current_cluster_score'].toPrecision(4));
+        if ('_current_cluster_id' in eventData) {
+          contentHelper.appendTextRow(i18nString(UIStrings.currentClusterId), eventData['_current_cluster_id']);
+        }
+        if ('_current_cluster_score' in eventData) {
+          contentHelper.appendTextRow(
+              i18nString(UIStrings.currentClusterScore), eventData['_current_cluster_score'].toPrecision(4));
+        }
         contentHelper.appendTextRow(
             i18nString(UIStrings.hadRecentInput),
             eventData['had_recent_input'] ? i18nString(UIStrings.yes) : i18nString(UIStrings.no));
@@ -3783,3 +3787,47 @@ export interface TimelineMarkerStyle {
   tall: boolean;
   lowPriority: boolean;
 }
+
+export function assignLayoutShiftsToClusters(layoutShifts: readonly SDK.TracingModel.Event[]): void {
+  const gapTimeInMs = 1000;
+  const limitTimeInMs = 5000;
+  let firstTimestamp = Number.NEGATIVE_INFINITY;
+  let previousTimestamp = Number.NEGATIVE_INFINITY;
+  let currentClusterId = 0;
+  let currentClusterScore = 0;
+  let currentCluster = new Set<SDK.TracingModel.Event>();
+
+  for (const event of layoutShifts) {
+    if (event.args['data']['had_recent_input'] || event.args['data']['weighted_score_delta'] === undefined) {
+      continue;
+    }
+
+    if (event.startTime - firstTimestamp > limitTimeInMs || event.startTime - previousTimestamp > gapTimeInMs) {
+      // This means the event does not fit into the current session/cluster, so we need to start a new cluster.
+      firstTimestamp = event.startTime;
+
+      // Update all the layout shifts we found in this cluster to associate them with the cluster.
+      for (const layoutShift of currentCluster) {
+        layoutShift.args['data']['_current_cluster_score'] = currentClusterScore;
+        layoutShift.args['data']['_current_cluster_id'] = currentClusterId;
+      }
+
+      // Increment the cluster ID and reset the data.
+      currentClusterId += 1;
+      currentClusterScore = 0;
+      currentCluster = new Set();
+    }
+
+    // Store the timestamp of the previous layout shift.
+    previousTimestamp = event.startTime;
+    // Update the score of the current cluster and store this event in that cluster
+    currentClusterScore += event.args['data']['weighted_score_delta'];
+    currentCluster.add(event);
+  }
+
+  // The last cluster we find may not get closed out - so if not, update all the shifts that we associate with it.
+  for (const layoutShift of currentCluster) {
+    layoutShift.args['data']['_current_cluster_score'] = currentClusterScore;
+    layoutShift.args['data']['_current_cluster_id'] = currentClusterId;
+  }
+}

package/front_end/services/window_bounds/WindowBoundsService.ts

@@ -0,0 +1,27 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import * as Legacy from '../../ui/legacy/legacy.js';
+
+export interface WindowBoundsService {
+  getDevToolsBoundingElement(): HTMLElement;
+}
+
+let windowBoundsServiceImplInstance: WindowBoundsServiceImpl;
+export class WindowBoundsServiceImpl implements WindowBoundsService {
+  static instance(opts: {
+    forceNew: boolean|null,
+  } = {forceNew: null}): WindowBoundsServiceImpl {
+    const {forceNew} = opts;
+    if (!windowBoundsServiceImplInstance || forceNew) {
+      windowBoundsServiceImplInstance = new WindowBoundsServiceImpl();
+    }
+
+    return windowBoundsServiceImplInstance;
+  }
+
+  getDevToolsBoundingElement(): HTMLElement {
+    return Legacy.InspectorView.InspectorView.maybeGetInspectorViewInstance()?.element || document.body;
+  }
+}

package/front_end/services/window_bounds/window_bounds.ts

@@ -0,0 +1,9 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import * as WindowBoundsService from './WindowBoundsService.js';
+
+export {
+  WindowBoundsService,
+};

package/front_end/third_party/codemirror.next/bundle.ts

@@ -7,8 +7,9 @@
 import {StreamLanguage} from '@codemirror/stream-parser';
 
 export {
-  acceptCompletion, autocompletion, completeAnyWord, Completion, CompletionContext,
-  CompletionResult, CompletionSource, currentCompletions, ifNotIn
+  acceptCompletion, autocompletion, closeCompletion, completeAnyWord,
+  Completion, CompletionContext, CompletionResult, CompletionSource, currentCompletions,
+  ifNotIn, selectedCompletion, startCompletion,
 } from '@codemirror/autocomplete';
 export {closeBrackets, closeBracketsKeymap} from '@codemirror/closebrackets';
 export {
@@ -38,7 +39,7 @@ export {
 } from '@codemirror/state';
 export {StreamLanguage, StreamParser, StringStream} from '@codemirror/stream-parser';
 export {Line, Text, TextIterator} from '@codemirror/text';
-export {showTooltip, Tooltip, tooltips, TooltipView} from '@codemirror/tooltip';
+export { repositionTooltips,showTooltip, Tooltip, tooltips, TooltipView} from '@codemirror/tooltip';
 export {
   Command, Decoration, DecorationSet, drawSelection, EditorView,
   highlightSpecialChars, KeyBinding, keymap, MatchDecorator, placeholder,