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

feat(firefox): roll to r1317 (#12120)

Browse source
This commit is contained in:
Pavel Feldman 2022-02-15 21:55:52 -08:00 committed by GitHub
parent 85cb3c9713
commit d4deefbad3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/playwright-core/browsers.json
View file

@ -13,12 +13,12 @@
},
{
"name": "firefox",
"revision": "1316",
"revision": "1317",
"installByDefault": true
},
{
"name": "firefox-beta",
"revision": "1316",
"revision": "1317",
"installByDefault": false
},
{

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

@ -154,6 +154,7 @@ export class FFBrowser extends Browser {
export class FFBrowserContext extends BrowserContext {
declare readonly _browser: FFBrowser;
private _initScripts: string[] = [];
constructor(browser: FFBrowser, browserContextId: string | undefined, options: types.BrowserContextOptions) {
super(browser, options, browserContextId);
@ -322,7 +323,8 @@ export class FFBrowserContext extends BrowserContext {
}
async _doAddInitScript(source: string) {
await this._browser._connection.send('Browser.addScriptToEvaluateOnNewDocument', { browserContextId: this._browserContextId, script: source });
this._initScripts.push(source);
await this._browser._connection.send('Browser.setInitScripts', { browserContextId: this._browserContextId, scripts: this._initScripts.map(script => ({ script })) });
}
async _doExposeBinding(binding: PageBinding) {

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

@ -53,6 +53,7 @@ export class FFPage implements PageDelegate {
private _eventListeners: RegisteredListener[];
private _workers = new Map<string, { frameId: string, session: FFSession }>();
private _screencastId: string | undefined;
private _initScripts: { script: string, worldName?: string }[] = [];
constructor(session: FFSession, browserContext: FFBrowserContext, opener: FFPage | null) {
this._session = session;
@ -112,7 +113,7 @@ export class FFPage implements PageDelegate {
});
// Ideally, we somehow ensure that utility world is created before Page.ready arrives, but currently it is racy.
// Therefore, we can end up with an initialized page without utility world, although very unlikely.
this._session.send('Page.addScriptToEvaluateOnNewDocument', { script: '', worldName: UTILITY_WORLD_NAME }).catch(e => this._markAsError(e));
this.evaluateOnNewDocument('', UTILITY_WORLD_NAME).catch(e => this._markAsError(e));
}
async _markAsError(error: Error) {
@ -393,8 +394,9 @@ export class FFPage implements PageDelegate {
return success;
}
async evaluateOnNewDocument(source: string): Promise<void> {
await this._session.send('Page.addScriptToEvaluateOnNewDocument', { script: source });
async evaluateOnNewDocument(script: string, worldName?: string): Promise<void> {
this._initScripts.push({ script, worldName });
await this._session.send('Page.setInitScripts', { scripts: this._initScripts });
}
async closePage(runBeforeUnload: boolean): Promise<void> {

31
packages/playwright-core/src/server/firefox/protocol.d.ts vendored
View file

@ -208,11 +208,14 @@ export module Protocol {
hidden: boolean;
};
export type setScrollbarsHiddenReturnValue = void;
export type addScriptToEvaluateOnNewDocumentParameters = {
export type setInitScriptsParameters = {
browserContextId?: string;
script: string;
scripts: {
script: string;
worldName?: string;
}[];
};
export type addScriptToEvaluateOnNewDocumentReturnValue = void;
export type setInitScriptsReturnValue = void;
export type addBindingParameters = {
browserContextId?: string;
worldName?: string;
@ -354,6 +357,10 @@ export module Protocol {
width: number;
height: number;
};
export type InitScript = {
script: string;
worldName?: string;
};
export type readyPayload = {
}
export type crashedPayload = {
@ -528,11 +535,13 @@ export module Protocol {
};
};
export type scrollIntoViewIfNeededReturnValue = void;
export type addScriptToEvaluateOnNewDocumentParameters = {
script: string;
worldName?: string;
export type setInitScriptsParameters = {
scripts: {
script: string;
worldName?: string;
}[];
};
export type addScriptToEvaluateOnNewDocumentReturnValue = void;
export type setInitScriptsReturnValue = void;
export type navigateParameters = {
frameId: string;
url: string;
@ -1086,7 +1095,7 @@ export module Protocol {
"Browser.setTouchOverride": Browser.setTouchOverrideParameters;
"Browser.setDefaultViewport": Browser.setDefaultViewportParameters;
"Browser.setScrollbarsHidden": Browser.setScrollbarsHiddenParameters;
"Browser.addScriptToEvaluateOnNewDocument": Browser.addScriptToEvaluateOnNewDocumentParameters;
"Browser.setInitScripts": Browser.setInitScriptsParameters;
"Browser.addBinding": Browser.addBindingParameters;
"Browser.grantPermissions": Browser.grantPermissionsParameters;
"Browser.resetPermissions": Browser.resetPermissionsParameters;
@ -1108,7 +1117,7 @@ export module Protocol {
"Page.setCacheDisabled": Page.setCacheDisabledParameters;
"Page.describeNode": Page.describeNodeParameters;
"Page.scrollIntoViewIfNeeded": Page.scrollIntoViewIfNeededParameters;
"Page.addScriptToEvaluateOnNewDocument": Page.addScriptToEvaluateOnNewDocumentParameters;
"Page.setInitScripts": Page.setInitScriptsParameters;
"Page.navigate": Page.navigateParameters;
"Page.goBack": Page.goBackParameters;
"Page.goForward": Page.goForwardParameters;
@ -1165,7 +1174,7 @@ export module Protocol {
"Browser.setTouchOverride": Browser.setTouchOverrideReturnValue;
"Browser.setDefaultViewport": Browser.setDefaultViewportReturnValue;
"Browser.setScrollbarsHidden": Browser.setScrollbarsHiddenReturnValue;
"Browser.addScriptToEvaluateOnNewDocument": Browser.addScriptToEvaluateOnNewDocumentReturnValue;
"Browser.setInitScripts": Browser.setInitScriptsReturnValue;
"Browser.addBinding": Browser.addBindingReturnValue;
"Browser.grantPermissions": Browser.grantPermissionsReturnValue;
"Browser.resetPermissions": Browser.resetPermissionsReturnValue;
@ -1187,7 +1196,7 @@ export module Protocol {
"Page.setCacheDisabled": Page.setCacheDisabledReturnValue;
"Page.describeNode": Page.describeNodeReturnValue;
"Page.scrollIntoViewIfNeeded": Page.scrollIntoViewIfNeededReturnValue;
"Page.addScriptToEvaluateOnNewDocument": Page.addScriptToEvaluateOnNewDocumentReturnValue;
"Page.setInitScripts": Page.setInitScriptsReturnValue;
"Page.navigate": Page.navigateReturnValue;
"Page.goBack": Page.goBackReturnValue;
"Page.goForward": Page.goForwardReturnValue;