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

feat(webkit): roll webkit to 1124 (#736)

Browse source
This commit is contained in:
Pavel Feldman 2020-01-29 19:13:44 -08:00 committed by GitHub
parent 44829d6fdf
commit ce7219870b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -10,7 +10,7 @@
"playwright": { "playwright": {
"chromium_revision": "733125", "chromium_revision": "733125",
"firefox_revision": "1020", "firefox_revision": "1020",
"webkit_revision": "1120" "webkit_revision": "1124"
}, },
"scripts": { "scripts": {
"ctest": "cross-env BROWSER=chromium node test/test.js", "ctest": "cross-env BROWSER=chromium node test/test.js",

10
src/webkit/wkPage.ts
View file

@ -21,7 +21,7 @@ import * as dom from '../dom';
import * as network from '../network'; import * as network from '../network';
import { WKSession } from './wkConnection'; import { WKSession } from './wkConnection';
import { Events } from '../events'; import { Events } from '../events';
import { WKExecutionContext, EVALUATION_SCRIPT_URL } from './wkExecutionContext'; import { WKExecutionContext } from './wkExecutionContext';
import { WKInterceptableRequest } from './wkInterceptableRequest'; import { WKInterceptableRequest } from './wkInterceptableRequest';
import { WKWorkers } from './wkWorkers'; import { WKWorkers } from './wkWorkers';
import { Page, PageDelegate, Coverage } from '../page'; import { Page, PageDelegate, Coverage } from '../page';
@ -101,7 +101,7 @@ export class WKPage implements PageDelegate {
session.send('Page.getResourceTree').then(resourceTreeHandler), session.send('Page.getResourceTree').then(resourceTreeHandler),
// Resource tree should be received before first execution context. // Resource tree should be received before first execution context.
session.send('Runtime.enable'), session.send('Runtime.enable'),
session.send('Page.createIsolatedWorld', { name: UTILITY_WORLD_NAME, source: `//# sourceURL=${EVALUATION_SCRIPT_URL}` }), session.send('Page.createUserWorld', { name: UTILITY_WORLD_NAME }).catch(_ => {}), // Worlds are per-process
session.send('Console.enable'), session.send('Console.enable'),
session.send('Page.setInterceptFileChooserDialog', { enabled: true }), session.send('Page.setInterceptFileChooserDialog', { enabled: true }),
session.send('Network.enable'), session.send('Network.enable'),
@ -295,11 +295,11 @@ export class WKPage implements PageDelegate {
return; return;
const delegate = new WKExecutionContext(this._session, contextPayload.id); const delegate = new WKExecutionContext(this._session, contextPayload.id);
const context = new dom.FrameExecutionContext(delegate, frame); const context = new dom.FrameExecutionContext(delegate, frame);
if (contextPayload.isPageContext) if (contextPayload.type === 'normal')
frame._contextCreated('main', context); frame._contextCreated('main', context);
else if (contextPayload.name === UTILITY_WORLD_NAME) else if (contextPayload.type === 'user' && contextPayload.name === UTILITY_WORLD_NAME)
frame._contextCreated('utility', context); frame._contextCreated('utility', context);
if (contextPayload.isPageContext && frame === this._page.mainFrame()) if (contextPayload.type === 'normal' && frame === this._page.mainFrame())
this._mainFrameContextId = contextPayload.id; this._mainFrameContextId = contextPayload.id;
this._contextIdToContext.set(contextPayload.id, context); this._contextIdToContext.set(contextPayload.id, context);
} }