chrome-devtools-frontend 1.0.1515796 → 1.0.1515988

package/front_end/core/sdk/RehydratingConnection.ts

@@ -31,7 +31,7 @@ import type * as ProtocolClient from '../protocol_client/protocol_client.js';
 
 import * as EnhancedTraces from './EnhancedTracesParser.js';
 import type {
-  ProtocolMessage, RehydratingExecutionContext, RehydratingScript, RehydratingTarget, ServerMessage, TraceFile} from
+  ProtocolMessage, RehydratingExecutionContext, RehydratingScript, RehydratingTarget, ServerMessage} from
   './RehydratingObject.js';
 import {TraceObject} from './TraceObject.js';
 
@@ -66,11 +66,11 @@ export class RehydratingConnection implements ProtocolClient.InspectorBackend.Co
   rehydratingConnectionState: RehydratingConnectionState = RehydratingConnectionState.UNINITIALIZED;
   onDisconnect: ((arg0: string) => void)|null = null;
   onMessage: ((arg0: Object) => void)|null = null;
-  trace: TraceFile|null = null;
+  trace: TraceObject|null = null;
   sessions = new Map<number, RehydratingSessionBase>();
   #onConnectionLost: (message: Platform.UIString.LocalizedString) => void;
   #rehydratingWindow: Window&typeof globalThis;
-  #onReceiveHostWindowPayloadBound = this.#onReceiveHostWindowPayload.bind(this);
+  #onReceiveHostWindowPayloadBound = this.onReceiveHostWindowPayload.bind(this);
 
   constructor(onConnectionLost: (message: Platform.UIString.LocalizedString) => void) {
     // If we're invoking this class, we're in the rehydrating pop-up window. Rename window for clarity.
@@ -92,12 +92,12 @@ export class RehydratingConnection implements ProtocolClient.InspectorBackend.Co
    * This is a callback for rehydrated session to receive payload from host window. Payload includes but not limited to
    * the trace event and all necessary data to power a rehydrated session.
    */
-  #onReceiveHostWindowPayload(event: MessageEvent): void {
+  onReceiveHostWindowPayload(event: MessageEvent): void {
     if (event.data.type === 'REHYDRATING_TRACE_FILE') {
       const traceJson = event.data.traceJson as string;
       let trace;
       try {
-        trace = JSON.parse(traceJson) as TraceFile;
+        trace = new TraceObject(JSON.parse(traceJson));
       } catch {
         this.#onConnectionLost(i18nString(UIStrings.errorLoadingLog));
         return;
@@ -107,7 +107,7 @@ export class RehydratingConnection implements ProtocolClient.InspectorBackend.Co
     this.#rehydratingWindow.removeEventListener('message', this.#onReceiveHostWindowPayloadBound);
   }
 
-  async startHydration(trace: TraceFile): Promise<boolean> {
+  async startHydration(trace: TraceObject): Promise<boolean> {
     // OnMessage should've been set before hydration, and the connection should
     // be initialized and not hydrated already.
     if (!this.onMessage || this.rehydratingConnectionState !== RehydratingConnectionState.INITIALIZED) {
@@ -144,10 +144,10 @@ export class RehydratingConnection implements ProtocolClient.InspectorBackend.Co
         },
       });
 
-      // Create new session associated to the target created and send
-      // Target.attachedToTarget to frontend.
       sessionId += 1;
-      this.sessions.set(sessionId, new RehydratingSession(sessionId, target, executionContexts, scripts, this));
+      const session = new RehydratingSession(sessionId, target, executionContexts, scripts, this);
+      this.sessions.set(sessionId, session);
+      session.declareSessionAttachedToTarget();
     }
     await this.#onRehydrated();
     return true;
@@ -160,8 +160,8 @@ export class RehydratingConnection implements ProtocolClient.InspectorBackend.Co
 
     this.rehydratingConnectionState = RehydratingConnectionState.REHYDRATED;
     // Use revealer to load trace into performance panel
-    const trace = new TraceObject(this.trace.traceEvents as object[], this.trace.metadata);
-    await Common.Revealer.reveal(trace);
+
+    await Common.Revealer.reveal(this.trace);
   }
 
   setOnMessage(onMessage: (arg0: Object|string) => void): void {
@@ -220,11 +220,7 @@ class RehydratingSessionBase {
   }
 
   sendMessageToFrontend(payload: ServerMessage): void {
-    requestAnimationFrame(() => {
-      if (this.connection) {
-        this.connection.postToFrontend(payload);
-      }
-    });
+    this.connection?.postToFrontend(payload);
   }
 
   handleFrontendMessageAsFakeCDPAgent(data: ProtocolMessage): void {
@@ -250,7 +246,6 @@ export class RehydratingSession extends RehydratingSessionBase {
     this.target = target;
     this.executionContexts = executionContexts;
     this.scripts = scripts;
-    this.sessionAttachToTarget();
   }
 
   override sendMessageToFrontend(payload: ServerMessage, attachSessionId = true): void {
@@ -284,7 +279,7 @@ export class RehydratingSession extends RehydratingSessionBase {
     }
   }
 
-  private sessionAttachToTarget(): void {
+  declareSessionAttachedToTarget(): void {
     this.sendMessageToFrontend(
         {
           method: 'Target.attachedToTarget',

package/front_end/core/sdk/RehydratingObject.ts

@@ -4,28 +4,14 @@
 
 import type * as Protocol from '../../generated/protocol.js';
 
-import type {SourceMapV3} from './SourceMap.js';
-
-export interface RehydratingScript {
-  scriptId: Protocol.Runtime.ScriptId;
+// This object is emitted to ScriptParsed and also used in the RehydratingConnection
+export interface RehydratingScript extends Protocol.Debugger.ScriptParsedEvent {
+  sourceText?: string;
+  executionContextAuxData?: RehydratingExecutionContextAuxData;
   isolate: string;
-  /** The script's `src` */
-  url: string;
-  executionContextId: Protocol.Runtime.ExecutionContextId;
-  startLine: number;
-  startColumn: number;
-  endLine: number;
-  endColumn: number;
-  hash: string;
-  isModule?: boolean;
-  hasSourceURL?: boolean;
-  sourceMapURL?: string;
-  /** The manually provided string via the `//# sourceURL` directive */
+  /** The manually provided string via the `//# sourceURL` directive. Meanwhile the `url` is the script's `src`  */
   sourceURL?: string;
-  length?: number;
-  sourceText?: string;
-  auxData?: RehydratingExecutionContextAuxData;
-  pid?: number;
+  pid: number;
 }
 
 export interface RehydratingExecutionContextAuxData {
@@ -34,11 +20,9 @@ export interface RehydratingExecutionContextAuxData {
   type?: string;
 }
 
-export interface RehydratingExecutionContext {
-  id: Protocol.Runtime.ExecutionContextId;
-  origin: string;
+export interface RehydratingExecutionContext extends Protocol.Runtime.ExecutionContextDescription {
+  /** AKA V8ContextToken. https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/core/inspector/inspector_trace_events.cc;l=1229;drc=3c88f61e18b043e70c225d8d57c77832a85e7f58 */
   v8Context?: string;
-  name?: string;
   auxData?: RehydratingExecutionContextAuxData;
   isolate: string;
 }
@@ -80,10 +64,3 @@ export interface Session {
   executionContexts: RehydratingExecutionContext[];
   scripts: RehydratingScript[];
 }
-
-// TODO: we need to resolve the inability to use Trace model types inside SDK. For
-// now, duplicate a minimal type here.
-export interface TraceFile {
-  traceEvents: readonly object[];
-  metadata: {sourceMaps?: Array<{sourceMapUrl: string, sourceMap: SourceMapV3}>};
-}

package/front_end/core/sdk/RemoteObject.ts

@@ -1,37 +1,7 @@
-// Copyright 2021 The Chromium Authors
+// Copyright 2009 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/*
- * Copyright (C) 2009 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the #name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import * as Protocol from '../../generated/protocol.js';
 import type {DOMPinnedWebIDLProp, DOMPinnedWebIDLType} from '../common/JavaScriptMetaData.js';

package/front_end/core/sdk/ResourceTreeModel.ts

@@ -1,37 +1,7 @@
-// Copyright 2021 The Chromium Authors
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the #name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import * as Protocol from '../../generated/protocol.js';
 import * as Common from '../common/common.js';

package/front_end/core/sdk/RuntimeModel.ts

@@ -1,37 +1,7 @@
-// Copyright 2021 The Chromium Authors
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the #name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import type * as Protocol from '../../generated/protocol.js';
 import * as Common from '../common/common.js';

package/front_end/core/sdk/ServiceWorkerManager.ts

@@ -1,37 +1,7 @@
-// Copyright 2021 The Chromium Authors
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the #name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import * as Protocol from '../../generated/protocol.js';
 import * as Common from '../common/common.js';

package/front_end/core/sdk/SourceMap.ts

@@ -1,37 +1,7 @@
-// Copyright 2021 The Chromium Authors
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the #name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 import * as TextUtils from '../../models/text_utils/text_utils.js';
 import * as ScopesCodec from '../../third_party/source-map-scopes-codec/source-map-scopes-codec.js';
 import * as Common from '../common/common.js';

package/front_end/core/sdk/TraceObject.ts

@@ -8,13 +8,18 @@ import type * as Protocol from '../../generated/protocol.js';
 
 import type {NetworkRequest} from './NetworkRequest.js';
 import {ResourceTreeModel} from './ResourceTreeModel.js';
+import type {SourceMapV3} from './SourceMap.js';
 
 // A thin wrapper class, mostly to enable instanceof-based revealing of traces to open in Timeline.
 export class TraceObject {
   readonly traceEvents: Protocol.Tracing.DataCollectedEvent['value'];
-  readonly metadata: Object;
-  constructor(traceEvents: Protocol.Tracing.DataCollectedEvent['value'], metadata: Object = {}) {
-    this.traceEvents = traceEvents;
+  readonly metadata: {sourceMaps?: Array<{sourceMapUrl: string, sourceMap: SourceMapV3, url: string}>};
+  constructor(payload: Protocol.Tracing.DataCollectedEvent['value']|TraceObject, meta: Object = {}) {
+    // Handle the typical traceEvent array juggling here.
+    const events = Array.isArray(payload) ? payload : payload.traceEvents;
+    const metadata = meta ?? (!Array.isArray(payload) && payload.metadata) ?? {};
+
+    this.traceEvents = events;
     this.metadata = metadata;
   }
 }

package/front_end/entrypoints/main/MainImpl.ts

@@ -356,8 +356,6 @@ export class MainImpl {
         Root.Runtime.ExperimentName.TIMELINE_SHOW_POST_MESSAGE_EVENTS,
         'Performance panel: show postMessage dispatch and handling flows',
     );
-    Root.Runtime.experiments.register(
-        Root.Runtime.ExperimentName.TIMELINE_SAVE_AS_GZ, 'Performance panel: enable saving traces as .gz');
 
     Root.Runtime.experiments.enableExperimentsByDefault([
       Root.Runtime.ExperimentName.FULL_ACCESSIBILITY_TREE,

package/front_end/models/ai_assistance/AiHistoryStorage.ts

@@ -13,9 +13,7 @@ export const enum ConversationType {
   STYLING = 'freestyler',
   FILE = 'drjones-file',
   NETWORK = 'drjones-network-request',
-  PERFORMANCE_CALL_TREE = 'drjones-performance',
-  PERFORMANCE_INSIGHT = 'performance-insight',
-  PERFORMANCE_FULL = 'drjones-performance-full',
+  PERFORMANCE = 'drjones-performance-full',
 }
 
 export const NOT_FOUND_IMAGE_DATA = '';

package/front_end/models/ai_assistance/ConversationHandler.ts

@@ -50,7 +50,7 @@ export interface ExternalPerformanceAIConversationData {
 }
 
 export interface ExternalPerformanceRequestParameters {
-  conversationType: ConversationType.PERFORMANCE_FULL;
+  conversationType: ConversationType.PERFORMANCE;
   prompt: string;
   data: ExternalPerformanceAIConversationData;
 }
@@ -201,7 +201,7 @@ export class ConversationHandler {
         case ConversationType.STYLING: {
           return await this.#handleExternalStylingConversation(parameters.prompt, parameters.selector);
         }
-        case ConversationType.PERFORMANCE_FULL:
+        case ConversationType.PERFORMANCE:
           return await this.#handleExternalPerformanceConversation(parameters.prompt, parameters.data);
         case ConversationType.NETWORK:
           if (!parameters.requestUrl) {
@@ -348,10 +348,8 @@ export class ConversationHandler {
         agent = new FileAgent(options);
         break;
       }
-      case ConversationType.PERFORMANCE_FULL:
-      case ConversationType.PERFORMANCE_INSIGHT:
-      case ConversationType.PERFORMANCE_CALL_TREE: {
-        agent = new PerformanceAgent(options, conversationType);
+      case ConversationType.PERFORMANCE: {
+        agent = new PerformanceAgent(options);
         break;
       }
     }

package/front_end/models/ai_assistance/agents/AiAgent.ts

@@ -148,6 +148,9 @@ export interface ConversationSuggestion {
   jslogContext?: string;
 }
 
+/** At least one. */
+export type ConversationSuggestions = [ConversationSuggestion, ...ConversationSuggestion[]];
+
 export const enum ExternalRequestResponseType {
   ANSWER = 'answer',
   NOTIFICATION = 'notification',
@@ -196,7 +199,7 @@ export abstract class ConversationContext<T> {
     return;
   }
 
-  async getSuggestions(): Promise<[ConversationSuggestion, ...ConversationSuggestion[]]|undefined> {
+  async getSuggestions(): Promise<ConversationSuggestions|undefined> {
     return;
   }
 }