chore: revert

packages/puppeteer-core/src/cdp/Frame.ts

@@ -35,7 +35,6 @@ import type {CdpPage} from './Page.js';
 export class CdpFrame extends Frame {
   #url = '';
   #detached = false;
-  #isBeingSwapped = false;
   #client!: CDPSession;
   worlds!: IsolatedWorldChart;
 
@@ -87,7 +86,6 @@ export class CdpFrame extends Frame {
   }
 
   updateClient(client: CDPSession, keepWorlds = false): void {
-    this.#isBeingSwapped = false;
     this.#client = client;
     if (!keepWorlds) {
       // Clear the current contexts on previous world instances.
@@ -322,27 +320,23 @@ export class CdpFrame extends Frame {
   _navigated(framePayload: Protocol.Page.Frame): void {
     this._name = framePayload.name;
     this.#url = `${framePayload.url}${framePayload.urlFragment || ''}`;
-    this.#isBeingSwapped = false;
   }
 
   _navigatedWithinDocument(url: string): void {
     this.#url = url;
-    this.#isBeingSwapped = false;
   }
 
   _onLifecycleEvent(loaderId: string, name: string): void {
     if (name === 'init') {
       this._loaderId = loaderId;
       this._lifecycleEvents.clear();
     }
-    this.#isBeingSwapped = false;
     this._lifecycleEvents.add(name);
   }
 
   _onLoadingStopped(): void {
     this._lifecycleEvents.add('DOMContentLoaded');
     this._lifecycleEvents.add('load');
-    this.#isBeingSwapped = false;
   }
 
   _onLoadingStarted(): void {
@@ -365,13 +359,4 @@ export class CdpFrame extends Frame {
   exposeFunction(): never {
     throw new UnsupportedOperation();
   }
-
-  onFrameSwap(): void {
-    this.#isBeingSwapped = true;
-    this.emit(FrameEvent.FrameSwapped, undefined);
-  }
-
-  get isBeingSwapped(): boolean {
-    return this.#isBeingSwapped;
-  }
 }

packages/puppeteer-core/src/cdp/FrameManager.ts

@@ -262,9 +262,7 @@ export class FrameManager extends EventEmitter<FrameManagerEvents> {
   }
 
   frames(): CdpFrame[] {
-    return Array.from(this._frameTree.frames()).filter(frame => {
-      return !frame.isBeingSwapped;
-    });
+    return Array.from(this._frameTree.frames());
   }
 
   frame(frameId: string): CdpFrame | null {
@@ -465,7 +463,7 @@ export class FrameManager extends EventEmitter<FrameManagerEvents> {
         break;
       case 'swap':
         this.emit(FrameManagerEvent.FrameSwapped, frame);
-        frame.onFrameSwap();
+        frame.emit(FrameEvent.FrameSwapped, undefined);
         break;
     }
   }

packages/puppeteer-core/src/cdp/LifecycleWatcher.ts

@@ -255,7 +255,6 @@ export class LifecycleWatcher {
       for (const child of frame.childFrames()) {
         if (
           child._hasStartedLoading &&
-          !child.isBeingSwapped &&
           !checkLifecycle(child, expectedLifecycle)
         ) {
           return false;

packages/puppeteer-core/src/node/ChromeLauncher.ts

@@ -192,6 +192,7 @@ export class ChromeLauncher extends ProductLauncher {
 
     // Merge default enabled features with user-provided ones, if any.
     const enabledFeatures = [
+      'PdfOopif',
       // Add features to enable by default here.
       ...userEnabledFeatures,
     ].filter(feature => {

test/TestExpectations.json

@@ -577,12 +577,19 @@
     "comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
   },
   {
-    "testIdPattern": "[oopif.spec] OOPIF should load a page with a PDF viewer",
+    "testIdPattern": "[oopif.spec] OOPIF should evaluate on a page with a PDF viewer",
     "platforms": ["darwin", "linux", "win32"],
     "parameters": ["chrome-headless-shell"],
     "expectations": ["FAIL"],
     "comment": "chrome-headless-shell does not have a PDF viewer"
   },
+  {
+    "testIdPattern": "[oopif.spec] OOPIF should evaluate on a page with a PDF viewer",
+    "platforms": ["darwin", "linux", "win32"],
+    "parameters": ["firefox"],
+    "expectations": ["FAIL"],
+    "comment": "chrome-specific test"
+  },
   {
     "testIdPattern": "[page.spec] Page Page.addScriptTag should throw when added with content to the CSP page",
     "platforms": ["darwin", "linux", "win32"],
@@ -1444,10 +1451,10 @@
   },
   {
     "testIdPattern": "[elementhandle.spec] ElementHandle specs ElementHandle.clickablePoint should work for iframes",
-    "platforms": ["linux", "win32"],
+    "platforms": ["linux", "win32", "win32"],
     "parameters": ["cdp", "chrome"],
     "expectations": ["FAIL", "PASS"],
-    "comment": "Flaky on Windows and Linux"
+    "comment": "Flaky with fieldtrial testing config"
   },
   {
     "testIdPattern": "[elementhandle.spec] ElementHandle specs ElementHandle.isIntersectingViewport should work",
@@ -2952,13 +2959,6 @@
     "expectations": ["SKIP"],
     "comment": "Failed previously and currently times out"
   },
-  {
-    "testIdPattern": "[oopif.spec] OOPIF should load a page with a PDF viewer",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["chrome", "webDriverBiDi"],
-    "expectations": ["FAIL"],
-    "comment": "https://github.com/GoogleChromeLabs/chromium-bidi/issues/2175"
-  },
   {
     "testIdPattern": "[oopif.spec] OOPIF should report google.com frame",
     "platforms": ["darwin", "linux", "win32"],

test/src/cdp/TargetManager.spec.ts

@@ -39,7 +39,7 @@ describe('TargetManager', () => {
   });
 
   // CDP-specific test.
-  it.deflake(10, 'should handle targets', async () => {
+  it('should handle targets', async () => {
     const {server, context, browser} = state;
 
     const targetManager = browser._targetManager();
@@ -64,11 +64,9 @@ describe('TargetManager', () => {
     await framePromise;
     expect(await context.pages()).toHaveLength(1);
     expect(targetManager.getAvailableTargets().size).toBe(5);
-    await page.waitForFrame(() => {
-      return page.frames().length === 2;
-    });
+    expect(page.frames()).toHaveLength(2);
 
-    // attach a remote frame iframe.
+    // // attach a remote frame iframe.
     framePromise = page.waitForFrame(frame => {
       return frame.url() === server.CROSS_PROCESS_PREFIX + '/empty.html';
     });
@@ -80,9 +78,7 @@ describe('TargetManager', () => {
     await framePromise;
     expect(await context.pages()).toHaveLength(1);
     expect(targetManager.getAvailableTargets().size).toBe(6);
-    await page.waitForFrame(() => {
-      return page.frames().length === 3;
-    });
+    expect(page.frames()).toHaveLength(3);
 
     framePromise = page.waitForFrame(frame => {
       return frame.url() === server.CROSS_PROCESS_PREFIX + '/empty.html';
@@ -95,8 +91,6 @@ describe('TargetManager', () => {
     await framePromise;
     expect(await context.pages()).toHaveLength(1);
     expect(targetManager.getAvailableTargets().size).toBe(7);
-    await page.waitForFrame(() => {
-      return page.frames().length === 4;
-    });
+    expect(page.frames()).toHaveLength(4);
   });
 });

test/src/oopif.spec.ts

@@ -425,7 +425,19 @@ describe('OOPIF', function () {
     ).toEqual([true, true, false]);
   });
 
-  it('should load a page with a PDF viewer', async () => {
+  it('should exposeFunction on a page with a PDF viewer', async () => {
+    const {page, server} = state;
+
+    await page.goto(server.PREFIX + '/pdf-viewer.html', {
+      waitUntil: 'networkidle2',
+    });
+
+    await page.exposeFunction('test', () => {
+      console.log('test');
+    });
+  });
+
+  it('should evaluate on a page with a PDF viewer', async () => {
     const {page, server} = state;
 
     await page.goto(server.PREFIX + '/pdf-viewer.html', {
@@ -440,7 +452,12 @@ describe('OOPIF', function () {
           });
         })
       )
-    ).toEqual(['/pdf-viewer.html', '/sample.pdf']);
+    ).toEqual([
+      '/pdf-viewer.html',
+      '/sample.pdf',
+      '/index.html',
+      '/sample.pdf',
+    ]);
   });
 
   describe('waitForFrame', () => {