Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert "chore: ignore third-party execution contexts (#32437)"

Browse source 
This reverts commit d7b9cf21db.
This commit is contained in:
Yury Semikhatsky 2024-09-23 15:03:32 -07:00
parent b888e3c0d2
commit 3c73bc3b24
4 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/playwright-core/src/server/chromium/crPage.ts
View file

@ -694,16 +694,15 @@ class FrameSession {
if (!frame || this._eventBelongsToStaleFrame(frame._id)) if (!frame || this._eventBelongsToStaleFrame(frame._id))
return; return;
const delegate = new CRExecutionContext(this._client, contextPayload); const delegate = new CRExecutionContext(this._client, contextPayload);
let worldName: types.World; let worldName: types.World|null = null;
if (contextPayload.auxData && !!contextPayload.auxData.isDefault) if (contextPayload.auxData && !!contextPayload.auxData.isDefault)
worldName = 'main'; worldName = 'main';
else if (contextPayload.name === UTILITY_WORLD_NAME) else if (contextPayload.name === UTILITY_WORLD_NAME)
worldName = 'utility'; worldName = 'utility';
else
return;
const context = new dom.FrameExecutionContext(delegate, frame, worldName); const context = new dom.FrameExecutionContext(delegate, frame, worldName);
(context as any)[contextDelegateSymbol] = delegate; (context as any)[contextDelegateSymbol] = delegate;
frame._contextCreated(worldName, context); if (worldName)
frame._contextCreated(worldName, context);
this._contextIdToContext.set(contextPayload.id, context); this._contextIdToContext.set(contextPayload.id, context);
} }

4
packages/playwright-core/src/server/dom.ts
View file

@ -50,9 +50,9 @@ export function isNonRecoverableDOMError(error: Error) {
export class FrameExecutionContext extends js.ExecutionContext { export class FrameExecutionContext extends js.ExecutionContext {
readonly frame: frames.Frame; readonly frame: frames.Frame;
private _injectedScriptPromise?: Promise<js.JSHandle>; private _injectedScriptPromise?: Promise<js.JSHandle>;
readonly world: types.World; readonly world: types.World | null;
constructor(delegate: js.ExecutionContextDelegate, frame: frames.Frame, world: types.World) { constructor(delegate: js.ExecutionContextDelegate, frame: frames.Frame, world: types.World|null) {
super(frame, delegate, world || 'content-script'); super(frame, delegate, world || 'content-script');
this.frame = frame; this.frame = frame;
this.world = world; this.world = world;

7
packages/playwright-core/src/server/firefox/ffPage.ts
View file

@ -163,16 +163,15 @@ export class FFPage implements PageDelegate {
if (!frame) if (!frame)
return; return;
const delegate = new FFExecutionContext(this._session, executionContextId); const delegate = new FFExecutionContext(this._session, executionContextId);
let worldName: types.World; let worldName: types.World|null = null;
if (auxData.name === UTILITY_WORLD_NAME) if (auxData.name === UTILITY_WORLD_NAME)
worldName = 'utility'; worldName = 'utility';
else if (!auxData.name) else if (!auxData.name)
worldName = 'main'; worldName = 'main';
else
return;
const context = new dom.FrameExecutionContext(delegate, frame, worldName); const context = new dom.FrameExecutionContext(delegate, frame, worldName);
(context as any)[contextDelegateSymbol] = delegate; (context as any)[contextDelegateSymbol] = delegate;
frame._contextCreated(worldName, context); if (worldName)
frame._contextCreated(worldName, context);
this._contextIdToContext.set(executionContextId, context); this._contextIdToContext.set(executionContextId, context);
} }

7
packages/playwright-core/src/server/webkit/wkPage.ts
View file

@ -502,16 +502,15 @@ export class WKPage implements PageDelegate {
if (!frame) if (!frame)
return; return;
const delegate = new WKExecutionContext(this._session, contextPayload.id); const delegate = new WKExecutionContext(this._session, contextPayload.id);
let worldName: types.World; let worldName: types.World|null = null;
if (contextPayload.type === 'normal') if (contextPayload.type === 'normal')
worldName = 'main'; worldName = 'main';
else if (contextPayload.type === 'user' && contextPayload.name === UTILITY_WORLD_NAME) else if (contextPayload.type === 'user' && contextPayload.name === UTILITY_WORLD_NAME)
worldName = 'utility'; worldName = 'utility';
else
return;
const context = new dom.FrameExecutionContext(delegate, frame, worldName); const context = new dom.FrameExecutionContext(delegate, frame, worldName);
(context as any)[contextDelegateSymbol] = delegate; (context as any)[contextDelegateSymbol] = delegate;
frame._contextCreated(worldName, context); if (worldName)
frame._contextCreated(worldName, context);
this._contextIdToContext.set(contextPayload.id, context); this._contextIdToContext.set(contextPayload.id, context);
} }