chrome-devtools-frontend 1.0.922470 → 1.0.922924

package/front_end/panels/sources/TabbedEditorContainer.ts

@@ -236,11 +236,10 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
         SourceFrame.SourcesTextEditor.Events.SelectionChanged, this.selectionChanged, this);
   }
 
-  private scrollChanged(event: Common.EventTarget.EventTargetEvent): void {
+  private scrollChanged({data: lineNumber}: Common.EventTarget.EventTargetEvent<number>): void {
     if (this.scrollTimer) {
       clearTimeout(this.scrollTimer);
     }
-    const lineNumber = (event.data as number);
     this.scrollTimer = window.setTimeout(saveHistory.bind(this), 100);
     if (this.currentFileInternal) {
       this.history.updateScrollLineNumber(this.currentFileInternal.url(), lineNumber);
@@ -251,8 +250,7 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
     }
   }
 
-  private selectionChanged(event: Common.EventTarget.EventTargetEvent): void {
-    const range = (event.data as TextUtils.TextRange.TextRange);
+  private selectionChanged({data: range}: Common.EventTarget.EventTargetEvent<TextUtils.TextRange.TextRange>): void {
     if (this.currentFileInternal) {
       this.history.updateSelectionRange(this.currentFileInternal.url(), range);
     }

package/front_end/ui/components/docs/toggle_fonts.ts

@@ -6,7 +6,28 @@ const PLATFORM_MAC_CLASS = 'platform-mac';
 const PLATFORM_LINUX_CLASS = 'platform-linux';
 const PLATFORM_WINDOWS_CLASS = 'platform-windows';
 
+const urlParams = new URLSearchParams(window.location.search);
+
 export function init(): void {
+  // fontFamily is provided by the interaction tests.
+  // While platform-specific class names define multiple font-families,
+  // we want a single font-family to be used by the tests.
+  if (urlParams.has('fontFamily')) {
+    const div = document.createElement('div');
+    div.style.position = 'fixed';
+    div.style.bottom = '10px';
+    div.style.right = '230px';
+    div.style.width = '250px';
+    div.style.fontSize = '16px';
+    div.style.padding = '5px';
+    div.innerText = `font-family: ${urlParams.get('fontFamily')}`;
+    window.addEventListener('load', () => {
+      document.body.appendChild(div);
+    });
+    document.body.style.fontFamily = `${urlParams.get('fontFamily')}`;
+    return;
+  }
+
   document.body.classList.add(PLATFORM_LINUX_CLASS);
   const button = document.createElement('button');
 

package/front_end/ui/legacy/ContextMenu.ts

@@ -372,8 +372,8 @@ export class ContextMenu extends SubMenu {
   static initialize(): void {
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.addEventListener(
         Host.InspectorFrontendHostAPI.Events.SetUseSoftMenu, setUseSoftMenu);
-    function setUseSoftMenu(event: Common.EventTarget.EventTargetEvent): void {
-      ContextMenu.useSoftMenu = (event.data as boolean);
+    function setUseSoftMenu(event: Common.EventTarget.EventTargetEvent<boolean>): void {
+      ContextMenu.useSoftMenu = event.data;
     }
   }
 
@@ -470,8 +470,8 @@ export class ContextMenu extends SubMenu {
                .subItems as (SoftContextMenuDescriptor | Host.InspectorFrontendHostAPI.ContextMenuDescriptor)[];
   }
 
-  private onItemSelected(event: Common.EventTarget.EventTargetEvent): void {
-    this.itemSelected((event.data as number));
+  private onItemSelected(event: Common.EventTarget.EventTargetEvent<number>): void {
+    this.itemSelected(event.data);
   }
 
   private itemSelected(id: number): void {

package/front_end/ui/legacy/ForwardedInputEventHandler.ts

@@ -15,13 +15,9 @@ export class ForwardedInputEventHandler {
         Host.InspectorFrontendHostAPI.Events.KeyEventUnhandled, this.onKeyEventUnhandled, this);
   }
 
-  private onKeyEventUnhandled(event: Common.EventTarget.EventTargetEvent): void {
-    const data = event.data;
-    const type = (data.type as string);
-    const key = (data.key as string);
-    const keyCode = (data.keyCode as number);
-    const modifiers = (data.modifiers as number);
-
+  private onKeyEventUnhandled(
+      event: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.KeyEventUnhandledEvent>): void {
+    const {type, key, keyCode, modifiers} = event.data;
     if (type !== 'keydown') {
       return;
     }

package/front_end/ui/legacy/InspectorView.ts

@@ -188,8 +188,7 @@ export class InspectorView extends VBox implements ViewLocationResolver {
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.addEventListener(
         Host.InspectorFrontendHostAPI.Events.ShowPanel, showPanel.bind(this));
 
-    function showPanel(this: InspectorView, event: Common.EventTarget.EventTargetEvent): void {
-      const panelName = (event.data as string);
+    function showPanel(this: InspectorView, {data: panelName}: Common.EventTarget.EventTargetEvent<string>): void {
       this.showPanel(panelName);
     }
 

package/front_end/ui/legacy/Widget.ts

@@ -28,7 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import * as Common from '../../core/common/common.js';
 import * as DOMExtension from '../../core/dom_extension/dom_extension.js';
 import * as Helpers from '../components/helpers/helpers.js';
 
@@ -48,7 +47,7 @@ export class WidgetElement extends HTMLDivElement {
   }
 }
 
-export class Widget extends Common.ObjectWrapper.ObjectWrapper {
+export class Widget {
   element!: WidgetElement;
   contentElement: HTMLDivElement;
   private shadowRoot: ShadowRoot|undefined;
@@ -69,7 +68,6 @@ export class Widget extends Common.ObjectWrapper.ObjectWrapper {
   private invalidationsRequested?: boolean;
   private externallyManaged?: boolean;
   constructor(isWebComponent?: boolean, delegatesFocus?: boolean) {
-    super();
     this.contentElement = document.createElement('div');
     this.contentElement.classList.add('widget');
     if (isWebComponent) {

package/front_end/ui/legacy/components/color_picker/ContrastDetails.ts

@@ -88,7 +88,8 @@ export class ContrastDetails extends Common.ObjectWrapper.ObjectWrapper<EventTyp
   private contrastPassFailAPCA: HTMLElement;
   private readonly chooseBgColor: HTMLElement;
   private bgColorPickerButton: UI.Toolbar.ToolbarToggle;
-  private readonly bgColorPickedBound: (event: Common.EventTarget.EventTargetEvent) => void;
+  private readonly bgColorPickedBound:
+      (event: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.EyeDropperPickedColorEvent>) => void;
   private readonly bgColorSwatch: Swatch;
   constructor(
       contrastInfo: ContrastInfo, contentElement: Element,
@@ -449,13 +450,9 @@ export class ContrastDetails extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     }
   }
 
-  private bgColorPicked(event: Common.EventTarget.EventTargetEvent): void {
-    const rgbColor = event.data as {
-      r: number,
-      g: number,
-      b: number,
-      a: number,
-    };
+  private bgColorPicked({
+    data: rgbColor,
+  }: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.EyeDropperPickedColorEvent>): void {
     const rgba = [rgbColor.r, rgbColor.g, rgbColor.b, (rgbColor.a / 2.55 | 0) / 100];
     const color = Common.Color.Color.fromRGBA(rgba);
     this.contrastInfo.setBgColor(color);

package/front_end/ui/legacy/components/color_picker/Spectrum.ts

@@ -156,7 +156,8 @@ export class Spectrum extends Common.ObjectWrapper.eventMixin<EventTypes, typeof
   private readonly deleteIconToolbar: UI.Toolbar.Toolbar;
   private readonly deleteButton: UI.Toolbar.ToolbarButton;
   private readonly addColorToolbar: UI.Toolbar.Toolbar;
-  private readonly colorPickedBound: (event: Common.EventTarget.EventTargetEvent) => void;
+  private readonly colorPickedBound:
+      (event: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.EyeDropperPickedColorEvent>) => void;
   private hsv!: number[];
   private hueAlphaWidth!: number;
   dragWidth!: number;
@@ -1185,13 +1186,9 @@ export class Spectrum extends Common.ObjectWrapper.eventMixin<EventTypes, typeof
     }
   }
 
-  private colorPicked(event: Common.EventTarget.EventTargetEvent): void {
-    const rgbColor = event.data as {
-      r: number,
-      g: number,
-      b: number,
-      a: number,
-    };
+  private colorPicked({
+    data: rgbColor,
+  }: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.EyeDropperPickedColorEvent>): void {
     const rgba = [rgbColor.r, rgbColor.g, rgbColor.b, (rgbColor.a / 2.55 | 0) / 100];
     const color = Common.Color.Color.fromRGBA(rgba);
     this.innerSetColor(color.hsva(), '', undefined /* colorName */, undefined, ChangeSource.Other);

package/front_end/ui/legacy/components/perf_ui/OverviewGrid.ts

@@ -417,11 +417,10 @@ export class Window extends Common.ObjectWrapper.ObjectWrapper {
     this.windowLeft = windowLeft;
     this.windowRight = windowRight;
     this.updateCurtains();
-    let windowPosition;
     if (this.calculator) {
-      windowPosition = this.calculateWindowPosition();
+      this.dispatchEventToListeners(Events.WindowChangedWithPosition, this.calculateWindowPosition());
     }
-    this.dispatchEventToListeners(Events.WindowChanged, windowPosition);
+    this.dispatchEventToListeners(Events.WindowChanged);
   }
 
   private updateCurtains(): void {
@@ -523,8 +522,19 @@ export class Window extends Common.ObjectWrapper.ObjectWrapper {
 // eslint-disable-next-line rulesdir/const_enum
 export enum Events {
   WindowChanged = 'WindowChanged',
+  WindowChangedWithPosition = 'WindowChangedWithPosition',
 }
 
+export interface WindowChangedWithPositionEvent {
+  rawStartValue: number;
+  rawEndValue: number;
+}
+
+export type EventTypes = {
+  [Events.WindowChanged]: void,
+  [Events.WindowChangedWithPosition]: WindowChangedWithPositionEvent,
+};
+
 export class WindowSelector {
   private startPosition: number;
   private width: number;

package/front_end/ui/legacy/components/perf_ui/TimelineOverviewPane.ts

@@ -33,6 +33,7 @@ import type * as SDK from '../../../../core/sdk/sdk.js';
 import * as UI from '../../legacy.js';
 import * as i18n from '../../../../core/i18n/i18n.js';
 
+import type {WindowChangedWithPositionEvent} from './OverviewGrid.js';
 import {Events as OverviewGridEvents, OverviewGrid} from './OverviewGrid.js';
 import type {Calculator} from './TimelineGrid.js';
 
@@ -66,7 +67,7 @@ export class TimelineOverviewPane extends Common.ObjectWrapper.eventMixin<EventT
     this.cursorArea.addEventListener('mouseleave', this.hideCursor.bind(this), true);
 
     this.overviewGrid.setResizeEnabled(false);
-    this.overviewGrid.addEventListener(OverviewGridEvents.WindowChanged, this.onWindowChanged, this);
+    this.overviewGrid.addEventListener(OverviewGridEvents.WindowChangedWithPosition, this.onWindowChanged, this);
     this.overviewGrid.setClickHandler(this.onClick.bind(this));
     this.overviewControls = [];
     this.markers = new Map();
@@ -209,7 +210,7 @@ export class TimelineOverviewPane extends Common.ObjectWrapper.eventMixin<EventT
     return this.overviewControls.some(control => control.onClick(event));
   }
 
-  private onWindowChanged(event: Common.EventTarget.EventTargetEvent): void {
+  private onWindowChanged(event: Common.EventTarget.EventTargetEvent<WindowChangedWithPositionEvent>): void {
     if (this.muteOnWindowChanged) {
       return;
     }

package/front_end/ui/legacy/components/source_frame/SourcesTextEditor.ts

@@ -9,7 +9,9 @@ import * as TextEditor from '../text_editor/text_editor.js';
 
 const whitespaceStyleInjectedSet = new WeakSet<Document>();
 
-export class SourcesTextEditor extends TextEditor.CodeMirrorTextEditor.CodeMirrorTextEditor {
+export class SourcesTextEditor extends
+    Common.ObjectWrapper.eventMixin<EventTypes, typeof TextEditor.CodeMirrorTextEditor.CodeMirrorTextEditor>(
+        TextEditor.CodeMirrorTextEditor.CodeMirrorTextEditor) {
   private readonly delegate: SourcesTextEditorDelegate;
   private readonly gutterMouseMove: (event: Event) => void;
   private readonly gutterMouseOut: () => void;
@@ -486,7 +488,7 @@ export class SourcesTextEditor extends TextEditor.CodeMirrorTextEditor.CodeMirro
     if (from && to && from.equal(to)) {
       return;
     }
-    this.dispatchEventToListeners(Events.JumpHappened, {from: from, to: to});
+    this.dispatchEventToListeners(Events.JumpHappened, {from, to});
   }
 
   private scroll(): void {
@@ -696,6 +698,20 @@ export enum Events {
   JumpHappened = 'JumpHappened',
 }
 
+export interface JumpHappenedEvent {
+  from: TextUtils.TextRange.TextRange|null;
+  to: TextUtils.TextRange.TextRange|null;
+}
+
+export type EventTypes = {
+  [Events.GutterClick]: GutterClickEventData,
+  [Events.SelectionChanged]: TextUtils.TextRange.TextRange,
+  [Events.ScrollChanged]: number,
+  [Events.EditorFocused]: void,
+  [Events.EditorBlurred]: void,
+  [Events.JumpHappened]: JumpHappenedEvent,
+};
+
 export class SourcesTextEditorDelegate {
   populateLineGutterContextMenu(_contextMenu: UI.ContextMenu.ContextMenu, _lineNumber: number): Promise<void> {
     throw new Error('Not implemented');

package/package.json

@@ -55,5 +55,5 @@
     "unittest": "scripts/test/run_unittests.py --no-text-coverage",
     "watch": "third_party/node/node.py --output scripts/watch_build.js"
   },
-  "version": "1.0.922470"
+  "version": "1.0.922924"
 }