Skip to content

Commit

Permalink
browser(webkit): fix linux builds, install liblcms2-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
yury-s committed Mar 15, 2021
1 parent 226bee0 commit 4d76b0f
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 9 deletions.
4 changes: 2 additions & 2 deletions browser_patches/webkit/BUILD_NUMBER
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1445
Changed: yurys@chromium.org Mon 15 Mar 2021 02:46:43 PM PDT
1446
Changed: yurys@chromium.org Mon 15 Mar 2021 04:47:06 PM PDT
26 changes: 21 additions & 5 deletions browser_patches/webkit/patches/bootstrap.diff
Original file line number Diff line number Diff line change
Expand Up @@ -19746,18 +19746,26 @@ index 8e9947b0b3240f3fc09b3c6adb65e8f2e02cfed4..b9a8c84233515d7520de7194cb86385c
+
} // namespace WTR
diff --git a/Tools/gtk/install-dependencies b/Tools/gtk/install-dependencies
index d8b23a7bfe31ea3c99d7954a3de7022f7d47077f..26c5fc1630f6a888c3ab9286fafb6696b6840b1b 100755
index d8b23a7bfe31ea3c99d7954a3de7022f7d47077f..a2f56510dc9b27b06cead04a16ead24d9d885549 100755
--- a/Tools/gtk/install-dependencies
+++ b/Tools/gtk/install-dependencies
@@ -142,6 +142,7 @@ function installDependenciesWithApt {
@@ -119,6 +119,7 @@ function installDependenciesWithApt {
libgudev-1.0-dev \
libhyphen-dev \
libjpeg-dev \
+ liblcms2-dev \
libmount-dev \
libmpg123-dev \
libnotify-dev \
@@ -142,6 +143,7 @@ function installDependenciesWithApt {
libupower-glib-dev \
libwebp-dev \
libwoff-dev \
+ libxcb-glx0-dev \
libxcomposite-dev \
libxt-dev \
libxtst-dev \
@@ -150,6 +151,7 @@ function installDependenciesWithApt {
@@ -150,6 +152,7 @@ function installDependenciesWithApt {
nasm \
ninja-build \
patch \
Expand Down Expand Up @@ -19839,10 +19847,18 @@ index c09b6f39f894943f11b7a453428fab7d6f6e68fb..bc21acb648562ee0380811599b08f7d2
static cairo_user_data_key_t bufferKey;
cairo_surface_set_user_data(m_snapshot, &bufferKey, buffer,
diff --git a/Tools/wpe/install-dependencies b/Tools/wpe/install-dependencies
index 5575a3e9d6e153261b009a21b999ce65447a9b83..2f6e3571873d8aba3b548e190c3c04be795f76af 100755
index 5575a3e9d6e153261b009a21b999ce65447a9b83..39d37b6a23b6b7aadfc282cbdd94e26f60b91004 100755
--- a/Tools/wpe/install-dependencies
+++ b/Tools/wpe/install-dependencies
@@ -86,10 +86,12 @@ function installDependenciesWithApt {
@@ -77,6 +77,7 @@ function installDependenciesWithApt {
libicu-dev \
libjpeg-dev \
libfile-copy-recursive-perl \
+ liblcms2-dev \
libopenjp2-7-dev \
libpng-dev \
libseccomp-dev \
@@ -86,10 +87,12 @@ function installDependenciesWithApt {
libtool \
libwebp-dev \
libwoff-dev \
Expand Down
1 change: 1 addition & 0 deletions src/server/chromium/crPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,7 @@ class FrameSession {
const result = await this._client._sendMayFail('DOM.getContentQuads', {
objectId: handle._objectId
});
console.log('_getContentQuads', result);
if (!result)
return null;
const position = await this._framePosition();
Expand Down
4 changes: 2 additions & 2 deletions test/selectors-misc.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ it('should work for open shadow roots', async ({page, server}) => {
expect(await page.$$(`data-testid:light=foo`)).toEqual([]);
});

it('should click on links in shadow dom', (test, { browserName }) => {
test.fixme(browserName === 'chromium', 'Cannot get link quads, see #5765');
it.only('should click on links in shadow dom', (test, { browserName }) => {
// test.fixme(browserName === 'chromium', 'Cannot get link quads, see #5765');
}, async ({page, server}) => {
await page.goto(server.PREFIX + '/shadow-dom-link.html');
expect(await page.evaluate(() => (window as any).clickCount)).toBe(0);
Expand Down

0 comments on commit 4d76b0f

Please sign in to comment.