diff --git a/packages/playwright-core/src/server/bidi/bidiExecutionContext.ts b/packages/playwright-core/src/server/bidi/bidiExecutionContext.ts index 1d9cde0cf7..c9b1890af9 100644 --- a/packages/playwright-core/src/server/bidi/bidiExecutionContext.ts +++ b/packages/playwright-core/src/server/bidi/bidiExecutionContext.ts @@ -104,7 +104,7 @@ export class BidiExecutionContext implements js.ExecutionContextDelegate { throw new js.JavaScriptErrorInEvaluate('Unexpected response type: ' + JSON.stringify(response)); } - async getProperties(context: js.ExecutionContext, handle: js.JSHandle): Promise> { + async getProperties(handle: js.JSHandle): Promise> { const names = await handle.evaluate(object => { const names = []; const descriptors = Object.getOwnPropertyDescriptors(object); diff --git a/packages/playwright-core/src/server/chromium/crExecutionContext.ts b/packages/playwright-core/src/server/chromium/crExecutionContext.ts index 117d53ed53..4f4c505422 100644 --- a/packages/playwright-core/src/server/chromium/crExecutionContext.ts +++ b/packages/playwright-core/src/server/chromium/crExecutionContext.ts @@ -74,7 +74,7 @@ export class CRExecutionContext implements js.ExecutionContextDelegate { return returnByValue ? parseEvaluationResultValue(remoteObject.value) : createHandle(utilityScript._context, remoteObject); } - async getProperties(context: js.ExecutionContext, object: js.JSHandle): Promise> { + async getProperties(object: js.JSHandle): Promise> { const response = await this._client.send('Runtime.getProperties', { objectId: object._objectId!, ownProperties: true diff --git a/packages/playwright-core/src/server/firefox/ffExecutionContext.ts b/packages/playwright-core/src/server/firefox/ffExecutionContext.ts index 356ff11f24..d0388ae2fe 100644 --- a/packages/playwright-core/src/server/firefox/ffExecutionContext.ts +++ b/packages/playwright-core/src/server/firefox/ffExecutionContext.ts @@ -71,14 +71,14 @@ export class FFExecutionContext implements js.ExecutionContextDelegate { return createHandle(utilityScript._context, payload.result!); } - async getProperties(context: js.ExecutionContext, object: js.JSHandle): Promise> { + async getProperties(object: js.JSHandle): Promise> { const response = await this._session.send('Runtime.getObjectProperties', { executionContextId: this._executionContextId, objectId: object._objectId!, }); const result = new Map(); for (const property of response.properties) - result.set(property.name, createHandle(context, property.value)); + result.set(property.name, createHandle(object._context, property.value)); return result; } diff --git a/packages/playwright-core/src/server/javascript.ts b/packages/playwright-core/src/server/javascript.ts index 7cbadd5bd5..74a94f1652 100644 --- a/packages/playwright-core/src/server/javascript.ts +++ b/packages/playwright-core/src/server/javascript.ts @@ -51,7 +51,7 @@ export interface ExecutionContextDelegate { rawEvaluateJSON(expression: string): Promise; rawEvaluateHandle(expression: string): Promise; evaluateWithArguments(expression: string, returnByValue: boolean, utilityScript: JSHandle, values: any[], objectIds: ObjectId[]): Promise; - getProperties(context: ExecutionContext, object: JSHandle): Promise>; + getProperties(object: JSHandle): Promise>; releaseHandle(objectId: ObjectId): Promise; } @@ -88,8 +88,8 @@ export class ExecutionContext extends SdkObject { return this._raceAgainstContextDestroyed(this._delegate.evaluateWithArguments(expression, returnByValue, utilityScript, values, objectIds)); } - getProperties(context: ExecutionContext, object: JSHandle): Promise> { - return this._raceAgainstContextDestroyed(this._delegate.getProperties(context, object)); + getProperties(object: JSHandle): Promise> { + return this._raceAgainstContextDestroyed(this._delegate.getProperties(object)); } releaseHandle(objectId: ObjectId): Promise { @@ -174,7 +174,7 @@ export class JSHandle extends SdkObject { async getProperties(): Promise> { if (!this._objectId) return new Map(); - return this._context.getProperties(this._context, this); + return this._context.getProperties(this); } rawValue() { diff --git a/packages/playwright-core/src/server/webkit/wkExecutionContext.ts b/packages/playwright-core/src/server/webkit/wkExecutionContext.ts index 366d227035..f9386d3adc 100644 --- a/packages/playwright-core/src/server/webkit/wkExecutionContext.ts +++ b/packages/playwright-core/src/server/webkit/wkExecutionContext.ts @@ -87,7 +87,7 @@ export class WKExecutionContext implements js.ExecutionContextDelegate { } } - async getProperties(context: js.ExecutionContext, object: js.JSHandle): Promise> { + async getProperties(object: js.JSHandle): Promise> { const response = await this._session.send('Runtime.getProperties', { objectId: object._objectId!, ownProperties: true @@ -96,7 +96,7 @@ export class WKExecutionContext implements js.ExecutionContextDelegate { for (const property of response.properties) { if (!property.enumerable || !property.value) continue; - result.set(property.name, createHandle(context, property.value)); + result.set(property.name, createHandle(object._context, property.value)); } return result; }