chrome-devtools-frontend 1.0.1040857 → 1.0.1070764

package/front_end/panels/webauthn/WebauthnPane.ts

@@ -284,13 +284,13 @@ export class WebauthnPaneImpl extends UI.Widget.VBox implements
   }
 
   modelAdded(model: SDK.WebAuthnModel.WebAuthnModel): void {
-    if (model.target() === SDK.TargetManager.TargetManager.instance().mainTarget()) {
+    if (model.target() === SDK.TargetManager.TargetManager.instance().mainFrameTarget()) {
       this.#model = model;
     }
   }
 
   modelRemoved(model: SDK.WebAuthnModel.WebAuthnModel): void {
-    if (model.target() === SDK.TargetManager.TargetManager.instance().mainTarget()) {
+    if (model.target() === SDK.TargetManager.TargetManager.instance().mainFrameTarget()) {
       this.#model = undefined;
     }
   }

package/front_end/panels/webauthn/webauthnPane.css

@@ -169,6 +169,7 @@ td .text-button {
   align-items: center;
   height: 100%;
   text-align: center;
+  overflow: hidden;
 }
 
 .webauthn-pane.enabled .learn-more {

package/front_end/services/puppeteer/PuppeteerConnection.ts

@@ -6,7 +6,7 @@ import * as puppeteer from '../../third_party/puppeteer/puppeteer.js';
 import type * as Protocol from '../../generated/protocol.js';
 import type * as SDK from '../../core/sdk/sdk.js';
 
-export class Transport implements puppeteer.ConnectionTransport {
+class Transport implements puppeteer.ConnectionTransport {
   #connection: SDK.Connections.ParallelConnectionInterface;
   #knownIds = new Set<number>();
 
@@ -14,10 +14,10 @@ export class Transport implements puppeteer.ConnectionTransport {
     this.#connection = connection;
   }
 
-  send(message: string): void {
-    const data = JSON.parse(message);
-    this.#knownIds.add(data.id);
-    this.#connection.sendRawMessage(JSON.stringify(data));
+  send(data: string): void {
+    const message = JSON.parse(data);
+    this.#knownIds.add(message.id);
+    this.#connection.sendRawMessage(data);
   }
 
   close(): void {
@@ -26,9 +26,6 @@ export class Transport implements puppeteer.ConnectionTransport {
 
   set onmessage(cb: (message: string) => void) {
     this.#connection.setOnMessage((message: Object) => {
-      if (!cb) {
-        return;
-      }
       const data = (message) as {id: number, method: string, params: unknown, sessionId?: string};
       if (data.id && !this.#knownIds.has(data.id)) {
         return;
@@ -59,7 +56,7 @@ export class Transport implements puppeteer.ConnectionTransport {
   }
 }
 
-export class PuppeteerConnection extends puppeteer.Connection {
+class PuppeteerConnection extends puppeteer.Connection {
   override async onMessage(message: string): Promise<void> {
     const msgObj = JSON.parse(message) as {id: number, method: string, params: unknown, sessionId?: string};
     if (msgObj.sessionId && !this._sessions.has(msgObj.sessionId)) {
@@ -69,43 +66,55 @@ export class PuppeteerConnection extends puppeteer.Connection {
   }
 }
 
-export async function getPuppeteerConnection(
-    rawConnection: SDK.Connections.ParallelConnectionInterface,
+export class PuppeteerConnectionHelper {
+  static async connectPuppeteerToConnection(options: {
+    connection: SDK.Connections.ParallelConnectionInterface,
     mainFrameId: string,
-    mainTargetId: string,
-    ): Promise<{page: puppeteer.Page | null, browser: puppeteer.Browser}> {
-  const transport = new Transport(rawConnection);
+    targetInfos: Protocol.Target.TargetInfo[],
+    targetFilterCallback: (targetInfo: Protocol.Target.TargetInfo) => boolean,
+    isPageTargetCallback: (targetInfo: Protocol.Target.TargetInfo) => boolean,
+  }): Promise<{
+    page: puppeteer.Page | null,
+    browser: puppeteer.Browser,
+    puppeteerConnection: puppeteer.Connection,
+  }> {
+    const {connection, mainFrameId, targetInfos, targetFilterCallback, isPageTargetCallback} = options;
+    // Pass an empty message handler because it will be overwritten by puppeteer anyways.
+    const transport = new Transport(connection);
 
-  // url is an empty string in this case parallel to:
-  // https://github.com/puppeteer/puppeteer/blob/f63a123ecef86693e6457b07437a96f108f3e3c5/src/common/BrowserConnector.ts#L72
-  const connection = new PuppeteerConnection('', transport);
+    // url is an empty string in this case parallel to:
+    // https://github.com/puppeteer/puppeteer/blob/f63a123ecef86693e6457b07437a96f108f3e3c5/src/common/BrowserConnector.ts#L72
+    const puppeteerConnection = new PuppeteerConnection('', transport);
+    const targetIdsForAutoAttachEmulation = targetInfos.filter(targetFilterCallback).map(t => t.targetId);
 
-  const targetFilterCallback = (targetInfo: Protocol.Target.TargetInfo): boolean => {
-    if (targetInfo.type !== 'page' && targetInfo.type !== 'iframe') {
-      return false;
-    }
-    // TODO only connect to iframes that are related to the main target. This requires refactoring in Puppeteer: https://github.com/puppeteer/puppeteer/issues/3667.
-    return targetInfo.targetId === mainTargetId || targetInfo.openerId === mainTargetId || targetInfo.type === 'iframe';
-  };
+    const browserPromise = puppeteer.Browser._create(
+        'chrome',
+        puppeteerConnection,
+        [] /* contextIds */,
+        false /* ignoreHTTPSErrors */,
+        undefined /* defaultViewport */,
+        undefined /* process */,
+        undefined /* closeCallback */,
+        targetFilterCallback,
+        isPageTargetCallback,
+    );
 
-  const browserPromise = puppeteer.Browser._create(
-      'chrome',
-      connection,
-      [] /* contextIds */,
-      false /* ignoreHTTPSErrors */,
-      undefined /* defaultViewport */,
-      undefined /* process */,
-      undefined /* closeCallback */,
-      targetFilterCallback,
-  );
+    const [, browser] = await Promise.all([
+      Promise.all(targetIdsForAutoAttachEmulation.map(
+          targetId => puppeteerConnection._createSession({targetId}, /* emulateAutoAttach= */ true))),
+      browserPromise,
+    ]);
 
-  const [, browser] = await Promise.all([
-    connection._createSession({targetId: mainTargetId}, /* emulateAutoAttach=*/ true),
-    browserPromise,
-  ]);
+    // TODO: replace this with browser.pages() once the Puppeteer version is rolled.
+    const pages =
+        await Promise.all(browser.browserContexts()
+                              .map(ctx => ctx.targets())
+                              .flat()
+                              .filter(target => target.type() === 'page' || target.url().startsWith('devtools://'))
+                              .map(target => target.page()));
+    const page =
+        pages.filter((p): p is puppeteer.Page => p !== null).find(p => p.mainFrame()._id === mainFrameId) || null;
 
-  const pages = await browser.pages();
-  const page = pages.find(p => p.mainFrame()._id === mainFrameId) || null;
-
-  return {page, browser};
+    return {page, browser, puppeteerConnection};
+  }
 }

package/front_end/third_party/additional_readme_paths.json

@@ -1,6 +1,5 @@
 [
   "acorn",
-  "acorn-loose",
   "codemirror",
   "codemirror.next",
   "chromium",

package/front_end/third_party/chromium/client-variations/ClientVariations.js

@@ -1,5 +1,5 @@
 /* eslint-disable */
-// Copyright 2020 The Chromium Authors. All rights reserved.
+// Copyright 2020 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

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

@@ -10,7 +10,7 @@ export {
   acceptCompletion, autocompletion, closeBrackets, closeBracketsKeymap
 , closeCompletion, completeAnyWord,
   Completion, CompletionContext, CompletionResult, CompletionSource, currentCompletions,
-  ifNotIn, selectedCompletion, startCompletion} from '@codemirror/autocomplete';
+  ifNotIn, moveCompletionSelection, selectedCompletion, startCompletion} from '@codemirror/autocomplete';
 export {
   cursorMatchingBracket, cursorSubwordBackward, cursorSubwordForward,
   history, historyKeymap,