From cb89757ad0fa05cadcb065f4d8ef80241926ef7c Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Thu, 21 Nov 2024 11:25:39 +0000 Subject: [PATCH] feat(webkit): roll to r2108 --- packages/playwright-core/browsers.json | 2 +- .../src/server/registry/nativeDeps.ts | 9 ++++++--- .../playwright-core/src/server/webkit/webkit.ts | 2 +- ...screenshot-element-padding-border-webkit.png | Bin 179 -> 272 bytes 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/playwright-core/browsers.json b/packages/playwright-core/browsers.json index c3b8f66203..1875a718b8 100644 --- a/packages/playwright-core/browsers.json +++ b/packages/playwright-core/browsers.json @@ -33,7 +33,7 @@ }, { "name": "webkit", - "revision": "2105", + "revision": "2108", "installByDefault": true, "revisionOverrides": { "mac10.14": "1446", diff --git a/packages/playwright-core/src/server/registry/nativeDeps.ts b/packages/playwright-core/src/server/registry/nativeDeps.ts index d569f13258..6e25e3a14f 100644 --- a/packages/playwright-core/src/server/registry/nativeDeps.ts +++ b/packages/playwright-core/src/server/registry/nativeDeps.ts @@ -329,7 +329,7 @@ export const deps: any = { 'libgstreamer-gl1.0-0', 'libgstreamer-plugins-base1.0-0', 'libgstreamer1.0-0', - 'libgtk-3-0', + 'libgtk-4-1', 'libgudev-1.0-0', 'libharfbuzz-icu0', 'libharfbuzz0b', @@ -400,6 +400,7 @@ export const deps: any = { 'libgsttag-1.0.so.0': 'libgstreamer-plugins-base1.0-0', 'libgstvideo-1.0.so.0': 'libgstreamer-plugins-base1.0-0', 'libgtk-3.so.0': 'libgtk-3-0', + 'libgtk-4.so.1': 'libgtk-4-1', 'libgudev-1.0.so.0': 'libgudev-1.0-0', 'libharfbuzz-icu.so.0': 'libharfbuzz-icu0', 'libharfbuzz.so.0': 'libharfbuzz0b', @@ -544,7 +545,7 @@ export const deps: any = { 'libgstreamer-plugins-bad1.0-0', 'libgstreamer-plugins-base1.0-0', 'libgstreamer1.0-0', - 'libgtk-3-0t64', + 'libgtk-4-1', 'libharfbuzz-icu0', 'libharfbuzz0b', 'libhyphen0', @@ -621,6 +622,7 @@ export const deps: any = { 'libgsttag-1.0.so.0': 'libgstreamer-plugins-base1.0-0', 'libgstvideo-1.0.so.0': 'libgstreamer-plugins-base1.0-0', 'libgtk-3.so.0': 'libgtk-3-0t64', + 'libgtk-4.so.1': 'libgtk-4-1', 'libharfbuzz-icu.so.0': 'libharfbuzz-icu0', 'libharfbuzz.so.0': 'libharfbuzz0b', 'libhyphen.so.0': 'libhyphen0', @@ -967,7 +969,7 @@ export const deps: any = { 'libgstreamer-gl1.0-0', 'libgstreamer-plugins-base1.0-0', 'libgstreamer1.0-0', - 'libgtk-3-0', + 'libgtk-4-1', 'libgudev-1.0-0', 'libharfbuzz-icu0', 'libharfbuzz0b', @@ -1028,6 +1030,7 @@ export const deps: any = { 'libXfixes.so.3': 'libxfixes3', 'libxkbcommon.so.0': 'libxkbcommon0', 'libXrandr.so.2': 'libxrandr2', + 'libgtk-4.so.1': 'libgtk-4-1', } }, }; diff --git a/packages/playwright-core/src/server/webkit/webkit.ts b/packages/playwright-core/src/server/webkit/webkit.ts index 9a11f6c56d..62fa807015 100644 --- a/packages/playwright-core/src/server/webkit/webkit.ts +++ b/packages/playwright-core/src/server/webkit/webkit.ts @@ -43,7 +43,7 @@ export class WebKit extends BrowserType { override doRewriteStartupLog(error: ProtocolError): ProtocolError { if (!error.logs) return error; - if (error.logs.includes('cannot open display')) + if (error.logs.includes('Failed to open display')) error.logs = '\n' + wrapInASCIIBox(kNoXServerRunningError, 1); return error; } diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-padding-border-webkit.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-padding-border-webkit.png index 971006d83d332b7fffd1f34db9858eaa805756b2..62d2ef8c815f4cd57dd6c0b180368601a5feb8f6 100644 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1|)l2v+e>Z#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#Vfxsk4XgZr0$ z^;z5Ee=C-GR=#?^X0_O!WBjF;t=Ed}J9b~?jPId4WD+93OSjz+-_87^D9yk~&5;l2 O3kFYDKbLh*2~7ZXEOF2P literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1SFZ&|8@Z>wj^(N7l!{JxM1({$v}||PZ!6K zjK;UO47nN{1XvDQe|-48*w^Ri635n6DVNh8%}thhe0$q==6P?g$9}%rBmG)pe?(xC gBS|pvS1-q$d=Hjv#tm$ffOax?y85}Sb4q9e0CpKZAOHXW