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

browser(webkit): fix mac compilation after latest roll (#6727)

Browse source
This commit is contained in:
Yury Semikhatsky 2021-05-24 21:56:10 +00:00 committed by GitHub
parent 2321abb2d9
commit 8770c64601
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser_patches/webkit/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1483 1484
Changed: yurys@chromium.org Mon 24 May 2021 12:26:08 PM PDT Changed: yurys@chromium.org Mon 24 May 2021 02:43:11 PM PDT

9
browser_patches/webkit/patches/bootstrap.diff
View file

@ -11965,10 +11965,10 @@ index 0000000000000000000000000000000000000000..4ec8b96bbbddf8a7b042f53a8068754a
+cairo_status_t cairo_image_surface_write_to_jpeg_mem(cairo_surface_t *sfc, unsigned char **data, size_t *len, int quality); +cairo_status_t cairo_image_surface_write_to_jpeg_mem(cairo_surface_t *sfc, unsigned char **data, size_t *len, int quality);
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..911f4f8f3eb0aa66fe6d11bb46a5f836febc5c60 index 0000000000000000000000000000000000000000..b30668cc6dfc1d090600980d9ff1da5ed52902aa
--- /dev/null --- /dev/null
+++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp +++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp
@@ -0,0 +1,272 @@ @@ -0,0 +1,271 @@
+/* +/*
+ * Copyright (C) 2020 Microsoft Corporation. + * Copyright (C) 2020 Microsoft Corporation.
+ * + *
@ -12219,10 +12219,9 @@ index 0000000000000000000000000000000000000000..911f4f8f3eb0aa66fe6d11bb46a5f836
+ } + }
+ auto cfData = adoptCF(CFDataCreateMutable(kCFAllocatorDefault, 0)); + auto cfData = adoptCF(CFDataCreateMutable(kCFAllocatorDefault, 0));
+ WebCore::encodeImage(imagePtr, CFSTR("public.jpeg"), m_screencastQuality * 0.1, cfData.get()); + WebCore::encodeImage(imagePtr, CFSTR("public.jpeg"), m_screencastQuality * 0.1, cfData.get());
+ Vector<char> base64Data; + String base64Data = base64EncodeToString(CFDataGetBytePtr(cfData.get()), CFDataGetLength(cfData.get()));
+ base64Encode(CFDataGetBytePtr(cfData.get()), CFDataGetLength(cfData.get()), base64Data);
+ ++m_screencastFramesInFlight; + ++m_screencastFramesInFlight;
+ m_frontendDispatcher->screencastFrame(String(base64Data.data(), base64Data.size()), displaySize.width(), displaySize.height()); + m_frontendDispatcher->screencastFrame(base64Data, displaySize.width(), displaySize.height());
+ } + }
+ if (m_encoder) + if (m_encoder)
+ m_encoder->encodeFrame(WTFMove(imageRef)); + m_encoder->encodeFrame(WTFMove(imageRef));

3
tests/chromium/js-coverage.spec.ts
View file

@ -16,10 +16,11 @@
import { contextTest as it, expect } from '../config/browserTest'; import { contextTest as it, expect } from '../config/browserTest';
it('should work', async function({page, server}) { it.only('should work', async function({page, server}) {
await page.coverage.startJSCoverage(); await page.coverage.startJSCoverage();
await page.goto(server.PREFIX + '/jscoverag e/simple.html', { waitUntil: 'load' }); await page.goto(server.PREFIX + '/jscoverag e/simple.html', { waitUntil: 'load' });
const coverage = await page.coverage.stopJSCoverage(); const coverage = await page.coverage.stopJSCoverage();
console.log(JSON.stringify(coverage, null, 2));
expect(coverage.length).toBe(1); expect(coverage.length).toBe(1);
expect(coverage[0].url).toContain('/jscoverage/simple.html'); expect(coverage[0].url).toContain('/jscoverage/simple.html');
expect(coverage[0].functions.find(f => f.functionName === 'foo').ranges[0].count).toEqual(1); expect(coverage[0].functions.find(f => f.functionName === 'foo').ranges[0].count).toEqual(1);