From d7937b806d331bf16c2016aaf16e932b1334eac8 Mon Sep 17 00:00:00 2001
From: Alex Rudenko <OrKoN@users.noreply.github.com>
Date: Mon, 17 Jan 2022 08:00:00 +0100
Subject: [PATCH] fix: error for pre-existing OOPIFs (#7899)

Issues: #7844, #7896
---
 src/common/FrameManager.ts |  2 +-
 test/oopif.spec.ts         | 25 ++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/common/FrameManager.ts b/src/common/FrameManager.ts
index ba1c9ba2237f1..c2639a956d3be 100644
--- a/src/common/FrameManager.ts
+++ b/src/common/FrameManager.ts
@@ -256,7 +256,7 @@ export class FrameManager extends EventEmitter {
     const session = Connection.fromSession(this._client).session(
       event.sessionId
     );
-    frame._updateClient(session);
+    if (frame) frame._updateClient(session);
     this.setupEventListeners(session);
     await this.initialize(session);
   }
diff --git a/test/oopif.spec.ts b/test/oopif.spec.ts
index 883936d6e618e..2696ac6ebb201 100644
--- a/test/oopif.spec.ts
+++ b/test/oopif.spec.ts
@@ -28,7 +28,10 @@ describeChromeOnly('OOPIF', function () {
     const { puppeteer, defaultBrowserOptions } = getTestState();
     browser = await puppeteer.launch(
       Object.assign({}, defaultBrowserOptions, {
-        args: (defaultBrowserOptions.args || []).concat(['--site-per-process']),
+        args: (defaultBrowserOptions.args || []).concat([
+          '--site-per-process',
+          '--remote-debugging-port=21222',
+        ]),
       })
     );
   });
@@ -309,6 +312,26 @@ describeChromeOnly('OOPIF', function () {
     expect(result.x).toBeGreaterThan(150); // padding + margin + border left
     expect(result.y).toBeGreaterThan(150); // padding + margin + border top
   });
+
+  it('should detect existing OOPIFs when Puppeteer connects to an existing page', async () => {
+    const { server, puppeteer } = getTestState();
+
+    const frame = page.waitForFrame((frame) =>
+      frame.url().endsWith('/oopif.html')
+    );
+    await page.goto(server.PREFIX + '/dynamic-oopif.html');
+    await frame;
+    expect(oopifs(context).length).toBe(1);
+    expect(page.frames().length).toBe(2);
+
+    const browserURL = 'http://127.0.0.1:21222';
+    const browser1 = await puppeteer.connect({ browserURL });
+    const target = await browser1.waitForTarget((target) =>
+      target.url().endsWith('dynamic-oopif.html')
+    );
+    await target.page();
+    browser1.disconnect();
+  });
 });
 
 /**