chrome-devtools-frontend 1.0.965611 → 1.0.966086

package/config/gni/devtools_grd_files.gni

@@ -1261,17 +1261,17 @@ grd_files_debug_sources = [
   "front_end/third_party/acorn-loose/package/dist/acorn-loose.mjs",
   "front_end/third_party/acorn/package/dist/acorn.mjs",
   "front_end/third_party/chromium/client-variations/ClientVariations.js",
-  "front_end/third_party/codemirror/package/addon/runmode/runmode-standalone.js",
-  "front_end/third_party/codemirror/package/mode/css/css.js",
-  "front_end/third_party/codemirror/package/mode/javascript/javascript.js",
-  "front_end/third_party/codemirror/package/mode/xml/xml.js",
+  "front_end/third_party/codemirror/package/addon/runmode/runmode-standalone.mjs",
+  "front_end/third_party/codemirror/package/mode/css/css.mjs",
+  "front_end/third_party/codemirror/package/mode/javascript/javascript.mjs",
+  "front_end/third_party/codemirror/package/mode/xml/xml.mjs",
   "front_end/third_party/diff/DiffWrapper.js",
   "front_end/third_party/diff/diff_match_patch.js",
   "front_end/third_party/i18n/i18n-impl.js",
   "front_end/third_party/i18n/locales.js",
   "front_end/third_party/i18n/localized-string-set.js",
   "front_end/third_party/intl-messageformat/package/intl-messageformat.esm.js",
-  "front_end/third_party/lighthouse/report-assets/report-generator.js",
+  "front_end/third_party/lighthouse/report-assets/report-generator.mjs",
   "front_end/third_party/lighthouse/report/bundle.js",
   "front_end/third_party/lit-html/directive.js",
   "front_end/third_party/lit-html/directives.js",

package/front_end/core/protocol_client/InspectorBackend.ts

@@ -648,6 +648,10 @@ export class TargetBase {
     return this.getAgent('EventBreakpoints');
   }
 
+  fetchAgent(): ProtocolProxyApi.FetchApi {
+    return this.getAgent('Fetch');
+  }
+
   heapProfilerAgent(): ProtocolProxyApi.HeapProfilerApi {
     return this.getAgent('HeapProfiler');
   }
@@ -804,6 +808,10 @@ export class TargetBase {
     this.registerDispatcher('DOMStorage', dispatcher);
   }
 
+  registerFetchDispatcher(dispatcher: ProtocolProxyApi.FetchDispatcher): void {
+    this.registerDispatcher('Fetch', dispatcher);
+  }
+
   registerHeapProfilerDispatcher(dispatcher: ProtocolProxyApi.HeapProfilerDispatcher): void {
     this.registerDispatcher('HeapProfiler', dispatcher);
   }

package/front_end/core/sdk/NetworkManager.ts

@@ -123,14 +123,17 @@ const CONNECTION_TYPES = new Map([
 
 export class NetworkManager extends SDKModel<EventTypes> {
   readonly dispatcher: NetworkDispatcher;
+  readonly fetchDispatcher: FetchDispatcher;
   readonly #networkAgent: ProtocolProxyApi.NetworkApi;
   readonly #bypassServiceWorkerSetting: Common.Settings.Setting<boolean>;
 
   constructor(target: Target) {
     super(target);
     this.dispatcher = new NetworkDispatcher(this);
+    this.fetchDispatcher = new FetchDispatcher(target.fetchAgent());
     this.#networkAgent = target.networkAgent();
     target.registerNetworkDispatcher(this.dispatcher);
+    target.registerFetchDispatcher(this.fetchDispatcher);
     if (Common.Settings.Settings.instance().moduleSetting('cacheDisabled').get()) {
       void this.#networkAgent.invoke_setCacheDisabled({cacheDisabled: true});
     }
@@ -372,6 +375,23 @@ export const Fast3GConditions: Conditions = {
 
 const MAX_EAGER_POST_REQUEST_BODY_LENGTH = 64 * 1024;  // bytes
 
+export class FetchDispatcher implements ProtocolProxyApi.FetchDispatcher {
+  readonly #fetchAgent: ProtocolProxyApi.FetchApi;
+
+  constructor(agent: ProtocolProxyApi.FetchApi) {
+    this.#fetchAgent = agent;
+  }
+
+  requestPaused({requestId, request, resourceType, responseStatusCode, responseHeaders}:
+                    Protocol.Fetch.RequestPausedEvent): void {
+    void MultitargetNetworkManager.instance().requestIntercepted(new InterceptedRequest(
+        this.#fetchAgent, request, resourceType, requestId, responseStatusCode, responseHeaders));
+  }
+
+  authRequired({}: Protocol.Fetch.AuthRequiredEvent): void {
+  }
+}
+
 export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   readonly #manager: NetworkManager;
   #requestsById: Map<string, NetworkRequest>;
@@ -782,23 +802,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     networkRequest.addEventSourceMessage(time, eventName, eventId, data);
   }
 
-  requestIntercepted({
-    interceptionId,
-    request,
-    frameId,
-    resourceType,
-    isNavigationRequest,
-    isDownload,
-    redirectUrl,
-    authChallenge,
-    responseErrorReason,
-    responseStatusCode,
-    responseHeaders,
-    requestId,
-  }: Protocol.Network.RequestInterceptedEvent): void {
-    void MultitargetNetworkManager.instance().requestIntercepted(new InterceptedRequest(
-        this.#manager.target().networkAgent(), interceptionId, request, frameId, resourceType, isNavigationRequest,
-        isDownload, redirectUrl, authChallenge, responseErrorReason, responseStatusCode, responseHeaders, requestId));
+  requestIntercepted({}: Protocol.Network.RequestInterceptedEvent): void {
   }
 
   requestWillBeSentExtraInfo({requestId, associatedCookies, headers, clientSecurityState, connectTiming}:
@@ -1070,7 +1074,8 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
   #userAgentOverrideInternal: string;
   #userAgentMetadataOverride: Protocol.Emulation.UserAgentMetadata|null;
   #customAcceptedEncodings: Protocol.Network.ContentEncoding[]|null;
-  readonly #agents: Set<ProtocolProxyApi.NetworkApi>;
+  readonly #networkAgents: Set<ProtocolProxyApi.NetworkApi>;
+  readonly #fetchAgents: Set<ProtocolProxyApi.FetchApi>;
   readonly inflightMainResourceRequests: Map<string, NetworkRequest>;
   #networkConditionsInternal: Conditions;
   #updatingInterceptionPatternsPromise: Promise<void>|null;
@@ -1087,7 +1092,8 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
     this.#userAgentOverrideInternal = '';
     this.#userAgentMetadataOverride = null;
     this.#customAcceptedEncodings = null;
-    this.#agents = new Set();
+    this.#networkAgents = new Set();
+    this.#fetchAgents = new Set();
     this.inflightMainResourceRequests = new Map();
     this.#networkConditionsInternal = NoThrottlingConditions;
     this.#updatingInterceptionPatternsPromise = null;
@@ -1162,6 +1168,7 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
 
   modelAdded(networkManager: NetworkManager): void {
     const networkAgent = networkManager.target().networkAgent();
+    const fetchAgent = networkManager.target().fetchAgent();
     if (this.#extraHeaders) {
       void networkAgent.invoke_setExtraHTTPHeaders({headers: this.#extraHeaders});
     }
@@ -1173,14 +1180,15 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
       void networkAgent.invoke_setBlockedURLs({urls: this.#effectiveBlockedURLs});
     }
     if (this.isIntercepting()) {
-      void networkAgent.invoke_setRequestInterception({patterns: this.#urlsForRequestInterceptor.valuesArray()});
+      void fetchAgent.invoke_enable({patterns: this.#urlsForRequestInterceptor.valuesArray()});
     }
     if (this.#customAcceptedEncodings === null) {
       void networkAgent.invoke_clearAcceptedEncodingsOverride();
     } else {
       void networkAgent.invoke_setAcceptedEncodings({encodings: this.#customAcceptedEncodings});
     }
-    this.#agents.add(networkAgent);
+    this.#networkAgents.add(networkAgent);
+    this.#fetchAgents.add(fetchAgent);
     if (this.isThrottling()) {
       this.updateNetworkConditions(networkAgent);
     }
@@ -1194,7 +1202,8 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
       }
       this.inflightMainResourceRequests.delete((entry[0] as string));
     }
-    this.#agents.delete(networkManager.target().networkAgent());
+    this.#networkAgents.delete(networkManager.target().networkAgent());
+    this.#fetchAgents.delete(networkManager.target().fetchAgent());
   }
 
   isThrottling(): boolean {
@@ -1208,7 +1217,7 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
 
   setNetworkConditions(conditions: Conditions): void {
     this.#networkConditionsInternal = conditions;
-    for (const agent of this.#agents) {
+    for (const agent of this.#networkAgents) {
       this.updateNetworkConditions(agent);
     }
     this.dispatchEventToListeners(MultitargetNetworkManager.Events.ConditionsChanged);
@@ -1236,7 +1245,7 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
 
   setExtraHTTPHeaders(headers: Protocol.Network.Headers): void {
     this.#extraHeaders = headers;
-    for (const agent of this.#agents) {
+    for (const agent of this.#networkAgents) {
       void agent.invoke_setExtraHTTPHeaders({headers: this.#extraHeaders});
     }
   }
@@ -1247,7 +1256,7 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
 
   private updateUserAgentOverride(): void {
     const userAgent = this.currentUserAgent();
-    for (const agent of this.#agents) {
+    for (const agent of this.#networkAgents) {
       void agent.invoke_setUserAgentOverride(
           {userAgent: userAgent, userAgentMetadata: this.#userAgentMetadataOverride || undefined});
     }
@@ -1297,7 +1306,7 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
 
   private updateAcceptedEncodingsOverride(): void {
     const customAcceptedEncodings = this.#customAcceptedEncodings;
-    for (const agent of this.#agents) {
+    for (const agent of this.#networkAgents) {
       if (customAcceptedEncodings === null) {
         void agent.invoke_clearAcceptedEncodingsOverride();
       } else {
@@ -1348,7 +1357,7 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
       return;
     }
     this.#effectiveBlockedURLs = urls;
-    for (const agent of this.#agents) {
+    for (const agent of this.#networkAgents) {
       void agent.invoke_setBlockedURLs({urls: this.#effectiveBlockedURLs});
     }
   }
@@ -1381,8 +1390,8 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
     }
     this.#updatingInterceptionPatternsPromise = null;
     const promises = ([] as Promise<unknown>[]);
-    for (const agent of this.#agents) {
-      promises.push(agent.invoke_setRequestInterception({patterns: this.#urlsForRequestInterceptor.valuesArray()}));
+    for (const agent of this.#fetchAgents) {
+      promises.push(agent.invoke_enable({patterns: this.#urlsForRequestInterceptor.valuesArray()}));
     }
     this.dispatchEventToListeners(MultitargetNetworkManager.Events.InterceptorsChanged);
     await Promise.all(promises);
@@ -1401,13 +1410,13 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
   }
 
   clearBrowserCache(): void {
-    for (const agent of this.#agents) {
+    for (const agent of this.#networkAgents) {
       void agent.invoke_clearBrowserCache();
     }
   }
 
   clearBrowserCookies(): void {
-    for (const agent of this.#agents) {
+    for (const agent of this.#networkAgents) {
       void agent.invoke_clearBrowserCookies();
     }
   }
@@ -1470,38 +1479,26 @@ export namespace MultitargetNetworkManager {
 }
 
 export class InterceptedRequest {
-  readonly #networkAgent: ProtocolProxyApi.NetworkApi;
-  readonly #interceptionId: Protocol.Network.InterceptionId;
+  readonly #fetchAgent: ProtocolProxyApi.FetchApi;
   #hasRespondedInternal: boolean;
   request: Protocol.Network.Request;
-  frameId: Protocol.Page.FrameId;
   resourceType: Protocol.Network.ResourceType;
-  isNavigationRequest: boolean;
-  isDownload: boolean;
-  redirectUrl: string|undefined;
-  authChallenge: Protocol.Network.AuthChallenge|undefined;
-  responseErrorReason: Protocol.Network.ErrorReason|undefined;
   responseStatusCode: number|undefined;
-  responseHeaders: Protocol.Network.Headers|undefined;
-  requestId: string|undefined;
+  responseHeaders: Protocol.Fetch.HeaderEntry[]|undefined;
+  requestId: Protocol.Fetch.RequestId;
 
   constructor(
-      networkAgent: ProtocolProxyApi.NetworkApi, interceptionId: Protocol.Network.InterceptionId,
-      request: Protocol.Network.Request, frameId: Protocol.Page.FrameId, resourceType: Protocol.Network.ResourceType,
-      isNavigationRequest: boolean, isDownload?: boolean, redirectUrl?: string,
-      authChallenge?: Protocol.Network.AuthChallenge, responseErrorReason?: Protocol.Network.ErrorReason,
-      responseStatusCode?: number, responseHeaders?: Protocol.Network.Headers, requestId?: string) {
-    this.#networkAgent = networkAgent;
-    this.#interceptionId = interceptionId;
+      fetchAgent: ProtocolProxyApi.FetchApi,
+      request: Protocol.Network.Request,
+      resourceType: Protocol.Network.ResourceType,
+      requestId: Protocol.Fetch.RequestId,
+      responseStatusCode?: number,
+      responseHeaders?: Protocol.Fetch.HeaderEntry[],
+  ) {
+    this.#fetchAgent = fetchAgent;
     this.#hasRespondedInternal = false;
     this.request = request;
-    this.frameId = frameId;
     this.resourceType = resourceType;
-    this.isNavigationRequest = isNavigationRequest;
-    this.isDownload = Boolean(isDownload);
-    this.redirectUrl = redirectUrl;
-    this.authChallenge = authChallenge;
-    this.responseErrorReason = responseErrorReason;
     this.responseStatusCode = responseStatusCode;
     this.responseHeaders = responseHeaders;
     this.requestId = requestId;
@@ -1513,17 +1510,9 @@ export class InterceptedRequest {
 
   async continueRequestWithContent(contentBlob: Blob): Promise<void> {
     this.#hasRespondedInternal = true;
-    const headers = [
-      'HTTP/1.1 200 OK',
-      'Date: ' + (new Date()).toUTCString(),
-      'Server: Chrome Devtools Request Interceptor',
-      'Connection: closed',
-      'Content-Length: ' + contentBlob.size,
-      'Content-Type: ' + contentBlob.type || 'text/x-unknown',
-    ];
-    const encodedResponse = await blobToBase64(new Blob([headers.join('\r\n'), '\r\n\r\n', contentBlob]));
-    void this.#networkAgent.invoke_continueInterceptedRequest(
-        {interceptionId: this.#interceptionId, rawResponse: encodedResponse});
+    const body = await blobToBase64(contentBlob);
+    void this.#fetchAgent.invoke_fulfillRequest(
+        {requestId: this.requestId, responseCode: this.responseStatusCode || 200, body});
 
     async function blobToBase64(blob: Blob): Promise<string> {
       const reader = new FileReader();
@@ -1548,18 +1537,17 @@ export class InterceptedRequest {
   continueRequestWithoutChange(): void {
     console.assert(!this.#hasRespondedInternal);
     this.#hasRespondedInternal = true;
-    void this.#networkAgent.invoke_continueInterceptedRequest({interceptionId: this.#interceptionId});
+    void this.#fetchAgent.invoke_continueRequest({requestId: this.requestId});
   }
 
   continueRequestWithError(errorReason: Protocol.Network.ErrorReason): void {
     console.assert(!this.#hasRespondedInternal);
     this.#hasRespondedInternal = true;
-    void this.#networkAgent.invoke_continueInterceptedRequest({interceptionId: this.#interceptionId, errorReason});
+    void this.#fetchAgent.invoke_failRequest({requestId: this.requestId, errorReason});
   }
 
   async responseBody(): Promise<ContentData> {
-    const response =
-        await this.#networkAgent.invoke_getResponseBodyForInterception({interceptionId: this.#interceptionId});
+    const response = await this.#fetchAgent.invoke_getResponseBody({requestId: this.requestId});
     const error = response.getError() || null;
     return {error: error, content: error ? null : response.body, encoded: response.base64Encoded};
   }
@@ -1714,7 +1702,7 @@ export interface Message {
 
 export interface InterceptionPattern {
   urlPattern: string;
-  interceptionStage: Protocol.Network.InterceptionStage;
+  requestStage: Protocol.Fetch.RequestStage;
 }
 
 export type RequestInterceptor = (request: InterceptedRequest) => Promise<void>;

package/front_end/entrypoints/formatter_worker/formatter_worker.ts

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import '../../third_party/codemirror/package/addon/runmode/runmode-standalone.js';
-import '../../third_party/codemirror/package/mode/css/css.js';
-import '../../third_party/codemirror/package/mode/xml/xml.js';
-import '../../third_party/codemirror/package/mode/javascript/javascript.js';
+import '../../third_party/codemirror/package/addon/runmode/runmode-standalone.mjs';
+import '../../third_party/codemirror/package/mode/css/css.mjs';
+import '../../third_party/codemirror/package/mode/xml/xml.mjs';
+import '../../third_party/codemirror/package/mode/javascript/javascript.mjs';
 
 import * as CSSFormatter from './CSSFormatter.js';
 import * as CSSRuleParser from './CSSRuleParser.js';

package/front_end/legacy_test_runner/bindings_test_runner/PersistenceTestRunner.js

@@ -23,7 +23,7 @@ Persistence.AutomappingStatus.prototype.toString = function() {
   return lines.join('\n');
 };
 
-BindingsTestRunner.waitForBinding = function(fileName) {
+BindingsTestRunner.waitForBinding = async function(fileName) {
   const uiSourceCodes = self.Workspace.workspace.uiSourceCodes();
 
   for (const uiSourceCode of uiSourceCodes) {
@@ -34,7 +34,7 @@ BindingsTestRunner.waitForBinding = function(fileName) {
     }
 
     if (uiSourceCode.name() === fileName) {
-      return Promise.resolve(binding);
+      return binding;
     }
   }
 

package/front_end/legacy_test_runner/heap_profiler_test_runner/heap_profiler_test_runner.js

@@ -624,14 +624,13 @@ HeapProfilerTestRunner.takeAndOpenSnapshot = async function(generator, callback)
   const snapshot = generator();
   const profileType = Profiler.ProfileTypeRegistry.instance.heapSnapshotProfileType;
 
-  function pushGeneratedSnapshot(reportProgress) {
+  async function pushGeneratedSnapshot(reportProgress) {
     if (reportProgress) {
       profileType.reportHeapSnapshotProgress({data: {done: 50, total: 100, finished: false}});
       profileType.reportHeapSnapshotProgress({data: {done: 100, total: 100, finished: true}});
     }
     snapshot.snapshot.typeId = 'HEAP';
     profileType.addHeapSnapshotChunk({data: JSON.stringify(snapshot)});
-    return Promise.resolve();
   }
 
   HeapProfilerTestRunner.takeAndOpenSnapshotCallback = callback;

package/front_end/models/persistence/IsolatedFileSystem.ts

@@ -98,12 +98,12 @@ export class IsolatedFileSystem extends PlatformFileSystem {
     this.fileLocks = new Map();
   }
 
-  static create(
+  static async create(
       manager: IsolatedFileSystemManager, path: string, embedderPath: string, type: string, name: string,
       rootURL: string): Promise<IsolatedFileSystem|null> {
     const domFileSystem = Host.InspectorFrontendHost.InspectorFrontendHostInstance.isolatedFileSystem(name, rootURL);
     if (!domFileSystem) {
-      return Promise.resolve(null as IsolatedFileSystem | null);
+      return null as IsolatedFileSystem | null;
     }
 
     const fileSystem = new IsolatedFileSystem(manager, path, embedderPath, domFileSystem, type);

package/front_end/models/persistence/NetworkPersistenceManager.ts

@@ -383,8 +383,7 @@ export class NetworkPersistenceManager extends Common.ObjectWrapper.ObjectWrappe
 
       return SDK.NetworkManager.MultitargetNetworkManager.instance().setInterceptionHandlerForPatterns(
           Array.from(patterns).map(
-              pattern =>
-                  ({urlPattern: pattern, interceptionStage: Protocol.Network.InterceptionStage.HeadersReceived})),
+              pattern => ({urlPattern: pattern, requestStage: Protocol.Fetch.RequestStage.Response})),
           this.interceptionHandlerBound);
     }
   }
@@ -467,8 +466,12 @@ export class NetworkPersistenceManager extends Common.ObjectWrapper.ObjectWrappe
 
     let mimeType = '';
     if (interceptedRequest.responseHeaders) {
-      const responseHeaders = SDK.NetworkManager.NetworkManager.lowercaseHeaders(interceptedRequest.responseHeaders);
-      mimeType = responseHeaders['content-type'];
+      for (const header of interceptedRequest.responseHeaders) {
+        if (header.name.toLowerCase() === 'content-type') {
+          mimeType = header.value;
+          break;
+        }
+      }
     }
 
     if (!mimeType) {

package/front_end/panels/event_listeners/EventListenersUtils.ts

@@ -5,10 +5,11 @@
 import * as Common from '../../core/common/common.js';
 import * as SDK from '../../core/sdk/sdk.js';
 
-export function frameworkEventListeners(object: SDK.RemoteObject.RemoteObject): Promise<FrameworkEventListenersObject> {
+export async function frameworkEventListeners(object: SDK.RemoteObject.RemoteObject):
+    Promise<FrameworkEventListenersObject> {
   const domDebuggerModel = object.runtimeModel().target().model(SDK.DOMDebuggerModel.DOMDebuggerModel);
   if (!domDebuggerModel) {
-    return Promise.resolve({eventListeners: [], internalHandlers: null} as FrameworkEventListenersObject);
+    return {eventListeners: [], internalHandlers: null} as FrameworkEventListenersObject;
   }
 
   const listenersResult = {internalHandlers: null, eventListeners: []} as FrameworkEventListenersObject;

package/front_end/panels/event_listeners/EventListenersView.ts

@@ -116,13 +116,13 @@ export class EventListenersView extends UI.Widget.VBox {
       frameworkEventListenersObject = result;
     }
 
-    function markInternalEventListeners(): Promise<void> {
+    async function markInternalEventListeners(): Promise<void> {
       if (!frameworkEventListenersObject) {
-        return Promise.resolve();
+        return;
       }
 
       if (!frameworkEventListenersObject.internalHandlers) {
-        return Promise.resolve();
+        return;
       }
       return frameworkEventListenersObject.internalHandlers.object()
           .callFunctionJSON(isInternalEventListener as (this: Object) => boolean[], eventListeners.map(handlerArgument))

package/front_end/panels/lighthouse/lighthouse.ts

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import '../../third_party/lighthouse/report-assets/report-generator.js';
+import '../../third_party/lighthouse/report-assets/report-generator.mjs';
 
 import * as LighthouseController from './LighthouseController.js';
 import * as LighthousePanel from './LighthousePanel.js';

package/front_end/panels/sources/DebuggerPausedMessage.ts

@@ -142,7 +142,7 @@ export class DebuggerPausedMessage {
     }
 
     const mainElement = messageWrapper.createChild('div', 'status-main');
-    mainElement.appendChild(UI.Icon.Icon.create('smallicon-info', 'status-icon'));
+    mainElement.appendChild(UI.Icon.Icon.create('smallicon-clear-info', 'status-icon'));
     const breakpointType = BreakpointTypeNouns.get(data.type);
     mainElement.appendChild(document.createTextNode(
         i18nString(UIStrings.pausedOnS, {PH1: breakpointType ? breakpointType() : String(null)})));
@@ -256,7 +256,7 @@ export class DebuggerPausedMessage {
     function buildWrapper(mainText: string, subText?: string, title?: string): Element {
       const messageWrapper = document.createElement('span');
       const mainElement = messageWrapper.createChild('div', 'status-main');
-      const icon = UI.Icon.Icon.create(errorLike ? 'smallicon-error' : 'smallicon-info', 'status-icon');
+      const icon = UI.Icon.Icon.create(errorLike ? 'smallicon-clear-error' : 'smallicon-clear-info', 'status-icon');
       mainElement.appendChild(icon);
       mainElement.appendChild(document.createTextNode(mainText));
       if (subText) {

package/front_end/panels/sources/SourcesPanel.ts

@@ -1153,12 +1153,11 @@ export class UILocationRevealer implements Common.Revealer.Revealer {
     return uILocationRevealerInstance;
   }
 
-  reveal(uiLocation: Object, omitFocus?: boolean): Promise<void> {
+  async reveal(uiLocation: Object, omitFocus?: boolean): Promise<void> {
     if (!(uiLocation instanceof Workspace.UISourceCode.UILocation)) {
-      return Promise.reject(new Error('Internal error: not a ui location'));
+      throw new Error('Internal error: not a ui location');
     }
     SourcesPanel.instance().showUILocation(uiLocation, omitFocus);
-    return Promise.resolve();
   }
 }
 
@@ -1203,12 +1202,11 @@ export class UISourceCodeRevealer implements Common.Revealer.Revealer {
     return uISourceCodeRevealerInstance;
   }
 
-  reveal(uiSourceCode: Object, omitFocus?: boolean): Promise<void> {
+  async reveal(uiSourceCode: Object, omitFocus?: boolean): Promise<void> {
     if (!(uiSourceCode instanceof Workspace.UISourceCode.UISourceCode)) {
-      return Promise.reject(new Error('Internal error: not a ui source code'));
+      throw new Error('Internal error: not a ui source code');
     }
     SourcesPanel.instance().showUISourceCode(uiSourceCode, undefined, undefined, omitFocus);
-    return Promise.resolve();
   }
 }
 
@@ -1226,11 +1224,10 @@ export class DebuggerPausedDetailsRevealer implements Common.Revealer.Revealer {
     return debuggerPausedDetailsRevealerInstance;
   }
 
-  reveal(_object: Object): Promise<void> {
-    if (!Common.Settings.Settings.instance().moduleSetting('autoFocusOnDebuggerPausedEnabled').get()) {
-      return Promise.resolve();
+  async reveal(_object: Object): Promise<void> {
+    if (Common.Settings.Settings.instance().moduleSetting('autoFocusOnDebuggerPausedEnabled').get()) {
+      return SourcesPanel.instance().setAsCurrentPanel();
     }
-    return SourcesPanel.instance().setAsCurrentPanel();
   }
 }
 

package/front_end/panels/sources/UISourceCodeFrame.ts

@@ -105,9 +105,9 @@ export class UISourceCodeFrame extends
 
     this.initializeUISourceCode();
 
-    function workingCopy(): Promise<TextUtils.ContentProvider.DeferredContent> {
+    async function workingCopy(): Promise<TextUtils.ContentProvider.DeferredContent> {
       if (uiSourceCode.isDirty()) {
-        return Promise.resolve({content: uiSourceCode.workingCopy(), isEncoded: false});
+        return {content: uiSourceCode.workingCopy(), isEncoded: false};
       }
       return uiSourceCode.requestContent();
     }
@@ -494,9 +494,9 @@ export class UISourceCodeFrame extends
     return {
       box: anchor,
       hide(): void{},
-      show: (popover: UI.GlassPane.GlassPane): Promise<true> => {
+      show: async(popover: UI.GlassPane.GlassPane): Promise<true> => {
         popover.contentElement.append(element);
-        return Promise.resolve(true);
+        return true;
       },
     };
   }

package/front_end/panels/sources/debuggerPausedMessage.css

@@ -56,12 +56,16 @@
 }
 
 .status-icon {
-  filter: hue-rotate(190deg);
   position: absolute;
   left: 0;
   top: calc(50% - 5px);
 }
 
+[is="ui-icon"].icon-mask.status-icon,
+:host-context(.-theme-with-dark-background) [is="ui-icon"].icon-mask.status-icon {
+  --override-icon-mask-background-color: var(--color-button-primary-background-hovering);
+}
+
 .paused-status.error-reason .status-icon {
   filter: none;
 }

package/front_end/third_party/codemirror/README.chromium

@@ -20,3 +20,8 @@ wget -qO- https://registry.npmjs.org/codemirror/-/codemirror-5.61.0.tgz | tar xz
 Local changes applied:
 - Run `wget -qOpackage/mode/wast/wast.js https://raw.githubusercontent.com/codemirror/CodeMirror/0bf9231f90925acc7b273ef9aaf89730ddf6e07b/mode/wast/wast.js` to synchronize unreleased changes for WebAssembly disassembly syntax highlighting.
 - Some files have a `.d.ts` file added, as they are used during TypeScript compilation
+- Change extension of following files from `.js` to `.mjs`.
+  - package/addon/runmode/runmode-standalone.js
+  - package/mode/css/css.js
+  - package/mode/javascript/javascript.js
+  - package/mode/xml/xml.js

package/front_end/third_party/codemirror/codemirror-tsconfig.json

@@ -3,9 +3,9 @@
     "composite": true
   },
   "files": [
-    "package/addon/runmode/runmode-standalone.js",
-    "package/mode/css/css.js",
-    "package/mode/javascript/javascript.js",
-    "package/mode/xml/xml.js"
+    "package/addon/runmode/runmode-standalone.mjs",
+    "package/mode/css/css.mjs",
+    "package/mode/javascript/javascript.mjs",
+    "package/mode/xml/xml.mjs"
   ]
 }

package/front_end/third_party/lighthouse/README.chromium

@@ -6,3 +6,5 @@ Security Critical: no
 
 This directory contains Chromium's version of the lighthouse report assets, including renderer.
 
+Local changes applied:
+- Change extension of `report-assets/report-generator.mjs` from `.js` to `.mjs`.

package/front_end/third_party/lighthouse/lighthouse-tsconfig.json

@@ -4,7 +4,7 @@
   },
   "files": [
     "report-assets/report.js",
-    "report-assets/report-generator.js",
+    "report-assets/report-generator.mjs",
     "lighthouse-dt-bundle.js"
   ]
 }

package/front_end/ui/legacy/Icon.ts

@@ -131,8 +131,8 @@ const initialDescriptors = new Map<string, Descriptor>([
   ['smallicon-warning', {position: 'd1', spritesheet: 'smallicons'}],
   ['smallicon-network-product', {position: 'e1', spritesheet: 'smallicons'}],
   ['smallicon-clear-warning', {position: 'f1', spritesheet: 'smallicons', isMask: true}],
-  ['smallicon-clear-info', {position: 'f2', spritesheet: 'smallicons'}],
-  ['smallicon-clear-error', {position: 'f3', spritesheet: 'smallicons'}],
+  ['smallicon-clear-info', {position: 'f2', spritesheet: 'smallicons', isMask: true}],
+  ['smallicon-clear-error', {position: 'f3', spritesheet: 'smallicons', isMask: true}],
   ['smallicon-account-circle', {position: 'f4', spritesheet: 'smallicons'}],
   ['smallicon-videoplayer-paused', {position: 'f6', spritesheet: 'smallicons', isMask: true}],
   ['smallicon-videoplayer-playing', {position: 'g6', spritesheet: 'smallicons', isMask: true}],

package/front_end/ui/legacy/components/object_ui/ObjectPropertiesSection.ts

@@ -1612,12 +1612,12 @@ export class Renderer implements UI.UIUtils.Renderer {
     return rendererInstance;
   }
 
-  render(object: Object, options?: UI.UIUtils.Options): Promise<{
+  async render(object: Object, options?: UI.UIUtils.Options): Promise<{
     node: Node,
     tree: UI.TreeOutline.TreeOutline|null,
   }|null> {
     if (!(object instanceof SDK.RemoteObject.RemoteObject)) {
-      return Promise.reject(new Error('Can\'t render ' + object));
+      throw new Error('Can\'t render ' + object);
     }
     options = options || {title: undefined, editable: undefined};
     const title = options.title;
@@ -1626,10 +1626,10 @@ export class Renderer implements UI.UIUtils.Renderer {
       section.titleLessMode();
     }
     section.editable = Boolean(options.editable);
-    return Promise.resolve(({node: section.element, tree: section} as {
+    return {node: section.element, tree: section} as {
       node: Node,
       tree: UI.TreeOutline.TreeOutline | null,
-    } | null));
+    } | null;
   }
 }
 

package/front_end/ui/legacy/themeColors.css

@@ -267,7 +267,7 @@
   --color-input-text-disabled: rgba(128 134 139 / 70%);
   /* Colors for styling buttons */
   --color-button-outline-focus: rgb(138 180 248 / 75%);
-  --color-button-primary-background-hovering: rgb(174 203 250 / 100%);
+  --color-button-primary-background-hovering: rgb(128 167 229 / 100%);
   --color-button-primary-background-pressed: rgb(210 227 252 / 100%);
   --color-button-primary-text: rgb(0 0 0);
   --color-button-secondary-background-hovering: rgb(138 180 248 / 15%);

package/package.json

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

package/scripts/build/devtools_plugin.js

@@ -42,6 +42,16 @@ function devtoolsPlugin(source, importer) {
   if (!importer) {
     return null;
   }
+
+  if (source === '../../lib/codemirror' || source === 'fs') {
+    // These are imported via require(...), but we don't use
+    // @rollup/plugin-commonjs. So this check is not necessary for rollup. But
+    // need to have this for esbuild as it doesn't ignore require(...).
+    return {
+      external: true,
+    };
+  }
+
   const currentDirectory = path.normalize(dirnameWithSeparator(importer));
   const importedFilelocation = path.normalize(path.join(currentDirectory, source));
   const importedFileDirectory = dirnameWithSeparator(importedFilelocation);

package/scripts/build/esbuild.js

@@ -0,0 +1,62 @@
+// Copyright 2022 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.
+
+// @ts-check
+
+const path = require('path');
+
+const devtools_paths = require('../devtools_paths.js');
+const devtools_plugin = require('./devtools_plugin.js');
+
+// esbuild module uses binary in this path.
+process.env.ESBUILD_BINARY_PATH = path.join(devtools_paths.devtoolsRootPath(), 'third_party', 'esbuild', 'esbuild');
+
+const entryPoints = [process.argv[2]];
+const outfile = process.argv[3];
+
+const outdir = path.dirname(outfile);
+
+const plugin = {
+  name: 'devtools-plugin',
+  setup(build) {
+    // https://esbuild.github.io/plugins/#on-resolve
+    build.onResolve({filter: /.*/}, args => {
+      const res = devtools_plugin.devtoolsPlugin(args.path, args.importer);
+      if (!res) {
+        return null;
+      }
+
+      if (res.external && res.id) {
+        return {
+          external: res.external,
+          path: './' + path.relative(outdir, res.id),
+        };
+      }
+
+      if (res.external) {
+        return {
+          external: true,
+        };
+      }
+
+      return {
+        path: res.id,
+      };
+    });
+  },
+};
+
+require('esbuild')
+    .build({
+      entryPoints,
+      outfile,
+      bundle: true,
+      format: 'esm',
+      platform: 'browser',
+      plugins: [plugin],
+    })
+    .catch(err => {
+      console.error('failed to run esbuild:', err);
+      process.exit(1);
+    });

package/scripts/build/ninja/bundle.gni

@@ -2,46 +2,91 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("../../../third_party/typescript/typescript.gni")
 import("./node.gni")
 import("./vars.gni")
 
+declare_args() {
+  # If this is enabled, devtools build uses esbuild instead of rollup.js to
+  # bundle JavaScript files.
+  devtools_fast_bundle = devtools_skip_typecheck
+}
+
+assert(!(devtools_fast_bundle && is_official_build),
+       "Official build should not bundle with esbuild")
+
 template("bundle") {
   assert(defined(invoker.entrypoint),
          "You must define the 'entrypoint' for a bundle target")
 
-  node_action(target_name) {
-    script = "node_modules/rollup/dist/bin/rollup"
-
-    forward_variables_from(invoker,
-                           [
-                             "visibility",
-                             "deps",
-                             "public_deps",
-                           ])
-
-    inputs = [
-      invoker.entrypoint,
-      devtools_location_prepend + "scripts/build/rollup.config.js",
-    ]
-
-    args = [
-      # TODO(crbug.com/1098074): We need to hide warnings that are written stderr,
-      # as Chromium does not process the returncode of the subprocess correctly
-      # and instead looks if `stderr` is empty.
-      "--silent",
-      "--config",
-      rebase_path(devtools_location_prepend + "scripts/build/rollup.config.js",
-                  root_build_dir),
-      "--input",
-      rebase_path(invoker.entrypoint, root_build_dir),
-      "--file",
-      rebase_path(invoker.output_file_location, root_build_dir),
-    ]
-
-    if (!devtools_dcheck_always_on) {
-      args += [ "--configDCHECK" ]
+  if (devtools_fast_bundle) {
+    node_action(target_name) {
+      script = "scripts/build/esbuild.js"
+      forward_variables_from(invoker,
+                             [
+                               "visibility",
+                               "deps",
+                               "public_deps",
+                             ])
+
+      inputs = [
+        invoker.entrypoint,
+        devtools_location_prepend + "scripts/build/devtools_plugin.js",
+        devtools_location_prepend + "scripts/devtools_paths.js",
+      ]
+
+      _esbuild = devtools_location_prepend + "third_party/esbuild/esbuild"
+      if (host_os == "win") {
+        inputs += [ _esbuild + ".exe" ]
+      } else {
+        inputs += [ _esbuild ]
+      }
+
+      args = [
+        rebase_path(invoker.entrypoint, root_build_dir),
+        rebase_path(invoker.output_file_location, root_build_dir),
+      ]
+
+      outputs = [ invoker.output_file_location ]
     }
+  } else {
+    node_action(target_name) {
+      script = "node_modules/rollup/dist/bin/rollup"
+
+      forward_variables_from(invoker,
+                             [
+                               "visibility",
+                               "deps",
+                               "public_deps",
+                             ])
+
+      inputs = [
+        invoker.entrypoint,
+        devtools_location_prepend + "scripts/build/rollup.config.js",
+        devtools_location_prepend + "scripts/build/devtools_plugin.js",
+        devtools_location_prepend + "scripts/devtools_paths.js",
+      ]
 
-    outputs = [ invoker.output_file_location ]
+      args = [
+        # TODO(crbug.com/1098074): We need to hide warnings that are written stderr,
+        # as Chromium does not process the returncode of the subprocess correctly
+        # and instead looks if `stderr` is empty.
+        "--silent",
+        "--config",
+        rebase_path(
+            devtools_location_prepend + "scripts/build/rollup.config.js",
+            root_build_dir),
+        "--input",
+        rebase_path(invoker.entrypoint, root_build_dir),
+        "--file",
+        rebase_path(invoker.output_file_location, root_build_dir),
+      ]
+
+      if (!devtools_dcheck_always_on) {
+        args += [ "--configDCHECK" ]
+      }
+
+      outputs = [ invoker.output_file_location ]
+    }
   }
 }