cherry-pick(#13443, #13407): feat(webkit): roll to r1630 (#13476)

This commit is contained in:
Yury Semikhatsky 2022-04-11 09:57:59 -07:00 committed by GitHub
parent 06d100ddcf
commit 1756566b17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 5 deletions

View file

@ -23,7 +23,7 @@
},
{
"name": "webkit",
"revision": "1625",
"revision": "1630",
"installByDefault": true,
"revisionOverrides": {
"mac10.14": "1446",

View file

@ -270,6 +270,8 @@ function isSharedLib(basename: string) {
}
async function executablesOrSharedLibraries(directoryPath: string): Promise<string[]> {
if (!fs.existsSync(directoryPath))
return [];
const allPaths = (await fs.promises.readdir(directoryPath)).map(file => path.resolve(directoryPath, file));
const allStats = await Promise.all(allPaths.map(aPath => fs.promises.stat(aPath)));
const filePaths = allPaths.filter((aPath, index) => (allStats[index] as any).isFile());

View file

@ -437,9 +437,11 @@ export class Registry {
path.join('minibrowser-gtk'),
path.join('minibrowser-gtk', 'bin'),
path.join('minibrowser-gtk', 'lib'),
path.join('minibrowser-gtk', 'sys', 'lib'),
path.join('minibrowser-wpe'),
path.join('minibrowser-wpe', 'bin'),
path.join('minibrowser-wpe', 'lib'),
path.join('minibrowser-wpe', 'sys', 'lib'),
];
this._executables.push({
type: 'browser',

View file

@ -853,11 +853,11 @@ export module Protocol {
*/
export interface Grouping {
/**
* Source of the media query: "media-rule" if specified by a @media rule, "media-import-rule" if specified by an @import rule, "media-link-node" if specified by a "media" attribute in a linked style sheet's LINK tag, "media-style-node" if specified by a "media" attribute in an inline style sheet's STYLE tag, "supports-rule" if specified by an @supports rule, "layer-rule" if specified by an @layer rule.
* Source of the media query: "media-rule" if specified by a @media rule, "media-import-rule" if specified by an @import rule, "media-link-node" if specified by a "media" attribute in a linked style sheet's LINK tag, "media-style-node" if specified by a "media" attribute in an inline style sheet's STYLE tag, "supports-rule" if specified by an @supports rule, "layer-rule" if specified by an @layer rule, "container-rule" if specified by an @container rule.
*/
type: "media-rule"|"media-import-rule"|"media-link-node"|"media-style-node"|"supports-rule"|"layer-rule"|"layer-import-rule";
type: "media-rule"|"media-import-rule"|"media-link-node"|"media-style-node"|"supports-rule"|"layer-rule"|"layer-import-rule"|"container-rule";
/**
* Query text if specified by a @media or @supports rule. Layer name (or not present for anonymous layers) for @layer rules.
* Query text if specified by a @media, @supports, or @container rule. Layer name (or not present for anonymous layers) for @layer rules.
*/
text?: string;
/**
@ -5345,6 +5345,10 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
* Connection information for the completed request.
*/
securityConnection?: Security.Connection;
/**
* Whether or not the connection was proxied through a server. If <code>true</code>, the <code>remoteAddress</code> will be for the proxy server, not the server that provided the resource to the proxy server.
*/
isProxyConnection?: boolean;
}
/**
* WebSocket request data.

View file

@ -96,7 +96,7 @@ it('should accept userDataDir', async ({ createUserDataDir, browserType }) => {
expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0);
});
it('should restore state from userDataDir', async ({ browserType, server, createUserDataDir }) => {
it('should restore state from userDataDir', async ({ browserType, server, createUserDataDir, isMac, browserName }) => {
it.slow();
const userDataDir = await createUserDataDir();