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

browser(webkit): fix screencast scale on Mac headful (#3797)

Browse source
This commit is contained in:
Yury Semikhatsky 2020-09-08 14:22:33 -07:00 committed by GitHub
parent 658b34e3fe
commit 1d4601b479
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 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 @@
1341 1342
Changed: pavel.feldman@gmail.com Thu Sep 3 23:32:06 PDT 2020 Changed: yurys@chromium.org Tue Sep 8 12:53:25 PDT 2020

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

@ -9837,10 +9837,10 @@ index f9c26832d3e91e8d747c5c1e0f0d76c34f4c3096..8b73efbba93362d8eebcc3a52158d8b0
} // namespace WebKit } // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Inspector/mac/ScreencastEncoderMac.mm b/Source/WebKit/UIProcess/Inspector/mac/ScreencastEncoderMac.mm diff --git a/Source/WebKit/UIProcess/Inspector/mac/ScreencastEncoderMac.mm b/Source/WebKit/UIProcess/Inspector/mac/ScreencastEncoderMac.mm
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..9b1e182c9f41a132df8c18b3655d52627b9d7686 index 0000000000000000000000000000000000000000..0700f3624b34ab536f4101a12ba5fbd9a81e9a58
--- /dev/null --- /dev/null
+++ b/Source/WebKit/UIProcess/Inspector/mac/ScreencastEncoderMac.mm +++ b/Source/WebKit/UIProcess/Inspector/mac/ScreencastEncoderMac.mm
@@ -0,0 +1,57 @@ @@ -0,0 +1,58 @@
+/* +/*
+ * Copyright (C) 2020 Microsoft Corporation. + * Copyright (C) 2020 Microsoft Corporation.
+ * + *
@ -9884,16 +9884,17 @@ index 0000000000000000000000000000000000000000..9b1e182c9f41a132df8c18b3655d5262
+ RetainPtr<CGContextRef> context = adoptCF(CGBitmapContextCreate(argb_data, width, height, bitsPerComponent, bytesPerRow, colorSpace.get(), kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little)); + RetainPtr<CGContextRef> context = adoptCF(CGBitmapContextCreate(argb_data, width, height, bitsPerComponent, bytesPerRow, colorSpace.get(), kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little));
+ double imageWidth = CGImageGetWidth(image); + double imageWidth = CGImageGetWidth(image);
+ double imageHeight = CGImageGetHeight(image); + double imageHeight = CGImageGetHeight(image);
+ // TODO: exclude controls from original screenshot
+ double pageHeight = imageHeight - offsetTop;
+ double ratio = 1; + double ratio = 1;
+ if (scale) { + if (scale) {
+ ratio = *scale; + ratio = *scale;
+ } else if (imageWidth > width || imageHeight > height) { + } else if (imageWidth > width || pageHeight > height) {
+ ratio = std::min(width / imageWidth, height / imageHeight); + ratio = std::min(width / imageWidth, height / pageHeight);
+ } + }
+ imageWidth *= ratio; + imageWidth *= ratio;
+ imageHeight *= ratio; + imageHeight *= ratio;
+ // TODO: exclude controls from original screenshot + pageHeight *= ratio;
+ CGFloat pageHeight = static_cast<CGFloat>(imageHeight) - offsetTop * ratio;
+ CGContextDrawImage(context.get(), CGRectMake(0, height - pageHeight, imageWidth, imageHeight), image); + CGContextDrawImage(context.get(), CGRectMake(0, height - pageHeight, imageWidth, imageHeight), image);
+} +}
+ +