feat(oop iframes): integrate OOP iframes with the frame manager

docs/api.md

@@ -195,6 +195,7 @@
   * [page.viewport()](#pageviewport)
   * [page.waitFor(selectorOrFunctionOrTimeout[, options[, ...args]])](#pagewaitforselectororfunctionortimeout-options-args)
   * [page.waitForFileChooser([options])](#pagewaitforfilechooseroptions)
+  * [page.waitForFrame(urlOrPredicate[, options])](#pagewaitforframeurlorpredicate-options)
   * [page.waitForFunction(pageFunction[, options[, ...args]])](#pagewaitforfunctionpagefunction-options-args)
   * [page.waitForNavigation([options])](#pagewaitfornavigationoptions)
   * [page.waitForNetworkIdle([options])](#pagewaitfornetworkidleoptions)
@@ -269,6 +270,7 @@
   * [frame.goto(url[, options])](#framegotourl-options)
   * [frame.hover(selector)](#framehoverselector)
   * [frame.isDetached()](#frameisdetached)
+  * [frame.isOOPFrame()](#frameisoopframe)
   * [frame.name()](#framename)
   * [frame.parentFrame()](#frameparentframe)
   * [frame.select(selector, ...values)](#frameselectselector-values)
@@ -385,6 +387,7 @@
 - [class: CDPSession](#class-cdpsession)
   * [cdpSession.connection()](#cdpsessionconnection)
   * [cdpSession.detach()](#cdpsessiondetach)
+  * [cdpSession.id()](#cdpsessionid)
   * [cdpSession.send(method[, ...paramArgs])](#cdpsessionsendmethod-paramargs)
 - [class: Coverage](#class-coverage)
   * [coverage.startCSSCoverage([options])](#coveragestartcsscoverageoptions)
@@ -2769,6 +2772,19 @@ await fileChooser.accept(['/tmp/myfile.pdf']);
 
 > **NOTE** “File picker” refers to the operating system’s file selection UI that lets you browse to a folder and select file(s) to be shared with the web app. It’s not the “Save file” dialog.
 
+#### page.waitForFrame(urlOrPredicate[, options])
+
+- `urlOrPredicate` <[string]|[Function]> A URL or predicate to wait for.
+- `options` <[Object]> Optional waiting parameters
+  - `timeout` <[number]> Maximum wait time in milliseconds, defaults to 30 seconds, pass `0` to disable the timeout. The default value can be changed by using the [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) method.
+- returns: <[Promise]<[Frame]>> Promise which resolves to the matched frame.
+
+```js
+const frame = await page.waitForFrame(async (frame) => {
+  return frame.name() === 'Test';
+});
+```
+
 #### page.waitForFunction(pageFunction[, options[, ...args]])
 
 - `pageFunction` <[function]|[string]> Function to be evaluated in browser context
@@ -3833,6 +3849,12 @@ If there's no element matching `selector`, the method throws an error.
 
 Returns `true` if the frame has been detached, or `false` otherwise.
 
+#### frame.isOOPFrame()
+
+- returns: <[boolean]>
+
+Returns `true` if the frame is an OOP frame, or `false` otherwise.
+
 #### frame.name()
 
 - returns: <[string]>
@@ -5088,6 +5110,12 @@ Returns the underlying connection associated with the session. Can be used to ob
 Detaches the cdpSession from the target. Once detached, the cdpSession object won't emit any events and can't be used
 to send messages.
 
+#### cdpSession.id()
+
+- returns: <[string]>
+
+Returns the session's id.
+
 #### cdpSession.send(method[, ...paramArgs])
 
 - `method` <[string]> protocol method name

src/common/Connection.ts

@@ -350,6 +350,13 @@ export class CDPSession extends EventEmitter {
     this._connection = null;
     this.emit(CDPSessionEmittedEvents.Disconnected);
   }
+
+  /**
+   * @internal
+   */
+  id(): string {
+    return this._sessionId;
+  }
 }
 
 /**

src/common/DOMWorld.ts

@@ -37,6 +37,7 @@ import {
 } from './EvalTypes.js';
 import { isNode } from '../environment.js';
 import { Protocol } from 'devtools-protocol';
+import { CDPSession } from './Connection.js';
 
 // predicateQueryHandler and checkWaitForOptions are declared here so that
 // TypeScript knows about them when used in the predicate function below.
@@ -72,6 +73,7 @@ export interface PageBinding {
  */
 export class DOMWorld {
   private _frameManager: FrameManager;
+  private _client: CDPSession;
   private _frame: Frame;
   private _timeoutSettings: TimeoutSettings;
   private _documentPromise?: Promise<ElementHandle> = null;
@@ -96,15 +98,19 @@ export class DOMWorld {
     `${name}_${contextId}`;
 
   constructor(
+    client: CDPSession,
     frameManager: FrameManager,
     frame: Frame,
     timeoutSettings: TimeoutSettings
   ) {
+    // Keep own reference to client because it might differ from the FrameManager's
+    // client for OOP iframes.
+    this._client = client;
     this._frameManager = frameManager;
     this._frame = frame;
     this._timeoutSettings = timeoutSettings;
     this._setContext(null);
-    frameManager._client.on('Runtime.bindingCalled', (event) =>
+    this._client.on('Runtime.bindingCalled', (event) =>
       this._onBindingCalled(event)
     );
   }