fix(frames): preserve request cancellation after rebase

#43650 (review): Rebased on 1d5572d; resolved the conflict by keeping detached-request cleanup on frame removal rather than page disposal, preserving page-close request errors.
#43650 (comment): Already addressed; retained frame detachment and context invalidation on page disposal.
#43650 (review): Retained original close errors; EX-243 and PA-051 pass across all three browsers after the rebase correction.
#43650 (comment): Already addressed; retained the pending iframe evaluation and required target-closed error.

Author: microsoft-playwright-automation[bot]

packages/playwright-core/src/server/frames.ts

@@ -50,7 +50,7 @@ import type * as channels from './channels';
 import type { AriaSnapshotJSON } from '@isomorphic/ariaSnapshot';
 
 type ContextData = {
-  contextPromise: ManualPromise<dom.FrameExecutionContext | { destroyedReason: string }>;
+  contextPromise: ManualPromise<dom.FrameExecutionContext | { destroyedError: Error }>;
   context: dom.FrameExecutionContext | null;
 };
 
@@ -141,7 +141,7 @@ export class FrameManager {
 
   dispose(error: Error) {
     for (const frame of this._frames.values()) {
-      frame._stopNetworkIdleTimer();
+      frame._onDetached(error);
       frame.invalidateNonStallingEvaluations(error);
     }
   }
@@ -378,6 +378,7 @@ export class FrameManager {
   private _removeFramesRecursively(frame: Frame) {
     this.removeChildFramesRecursively(frame);
     frame._onDetached();
+    frame._failInflightRequests(new Set());
     this._frames.delete(frame._id);
     if (!this._page.isClosed())
       this._page.emit(Page.Events.FrameDetached, frame);
@@ -787,10 +788,10 @@ export class Frame extends SdkObject<FrameEventMap> {
   context(world: types.World): Promise<dom.FrameExecutionContext> {
     if (this._page.delegate.noUtilityWorld?.())
       world = 'main';
-    return this._contextData.get(world)!.contextPromise.then(contextOrDestroyedReason => {
-      if (contextOrDestroyedReason instanceof js.ExecutionContext)
-        return contextOrDestroyedReason;
-      throw new Error(contextOrDestroyedReason.destroyedReason);
+    return this._contextData.get(world)!.contextPromise.then(contextOrDestroyedError => {
+      if (contextOrDestroyedError instanceof js.ExecutionContext)
+        return contextOrDestroyedError;
+      throw contextOrDestroyedError.destroyedError;
     });
   }
 
@@ -1743,14 +1744,13 @@ export class Frame extends SdkObject<FrameEventMap> {
     progress.setAllowConcurrentOrNestedRaces(false);
   }
 
-  _onDetached() {
+  _onDetached(error = new Error('Frame was detached')) {
     this._stopNetworkIdleTimer();
-    this._detachedScope.close(new Error('Frame was detached'));
-    this._failInflightRequests(new Set());
+    this._detachedScope.close(error);
     for (const data of this._contextData.values()) {
       if (data.context)
-        data.context.contextDestroyed('Frame was detached');
-      data.contextPromise.resolve({ destroyedReason: 'Frame was detached' });
+        data.context.contextDestroyed(error);
+      data.contextPromise.resolve({ destroyedError: error });
     }
     if (this._parentFrame)
       this._parentFrame._childFrames.delete(this);

packages/playwright-core/src/server/javascript.ts

@@ -69,8 +69,8 @@ export class ExecutionContext extends SdkObject {
     this.delegate = delegate;
   }
 
-  contextDestroyed(reason: string) {
-    this._contextDestroyedScope.close(new Error(reason));
+  contextDestroyed(reason: string | Error) {
+    this._contextDestroyedScope.close(typeof reason === 'string' ? new Error(reason) : reason);
   }
 
   async raceAgainstContextDestroyed<T>(promise: Promise<T>): Promise<T> {

tests/library/page-close.spec.ts

@@ -53,13 +53,19 @@ test('PA-041 addLocatorHandler should throw when page closes', async ({ page, se
   expect(error.message).toContain('custom reason');
 });
 
-test('PA-042 should reject all promises when page is closed', async ({ page }) => {
+test('PA-042 should reject all promises when page is closed', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/43647' } }, async ({ page, server }) => {
+  server.setRoute('/hang', () => {});
+  const requestPromise = server.waitForRequest('/hang');
+  await page.setContent(`<iframe src="${server.PREFIX}/hang"></iframe>`, { waitUntil: 'domcontentloaded' });
+  await requestPromise;
+  const frameErrorPromise = page.frames()[1].evaluate(() => new Promise<void>(() => {})).catch(e => e);
   let error = null;
   await Promise.all([
     page.evaluate(() => new Promise(r => {})).catch(e => error = e),
     page.close(),
   ]);
   expect(error.message).toContain(kTargetClosedErrorMessage);
+  expect((await frameErrorPromise).message).toContain(kTargetClosedErrorMessage);
 });
 
 test('PA-043 should set the page close state', async ({ page }) => {