Attachment 244176 Details for Bug 139884 – proposed patch

[patch] proposed patch

NominalResolution.txt (text/plain), 2.01 KB, created by Alexey Proskuryakov on 2015-01-07 12:44:48 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Proskuryakov

Created: 2015-01-07 12:44:48 PST

Size: 2.01 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 177978)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2015-01-06  Alexey Proskuryakov  <ap@apple.com>
>+
>+        [Mac WK2] Test snapshots are 1600x1200 on Retina devices
>+        https://bugs.webkit.org/show_bug.cgi?id=139884
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebKitTestRunner/mac/PlatformWebViewMac.mm: (WTR::PlatformWebView::windowSnapshotImage):
>+        Tell CGWindowListCreateImage to use the correct resolution. I don't really understand
>+        what the "nominal resolution" is, but this appears to work in practice.
>+
> 2015-01-05  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         Remove some stale class names in check-for-inappropriate-objc-class-names
>Index: Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
>===================================================================
>--- Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm	(revision 177978)
>+++ Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm	(working copy)
>@@ -230,7 +230,14 @@ void PlatformWebView::makeWebViewFirstRe
> WKRetainPtr<WKImageRef> PlatformWebView::windowSnapshotImage()
> {
>     [m_view display];
>-    RetainPtr<CGImageRef> windowSnapshotImage = adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, [m_window windowNumber], kCGWindowImageBoundsIgnoreFraming | kCGWindowImageShouldBeOpaque));
>+    CGWindowImageOption options = kCGWindowImageBoundsIgnoreFraming | kCGWindowImageShouldBeOpaque;
>+
>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
>+    if ([m_window backingScaleFactor] == 1)
>+        options |= kCGWindowImageNominalResolution;
>+#endif
>+
>+    RetainPtr<CGImageRef> windowSnapshotImage = adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, [m_window windowNumber], options));
> 
>     // windowSnapshotImage will be in GenericRGB, as we've set the main display's color space to GenericRGB.
>     return adoptWK(WKImageCreateFromCGImage(windowSnapshotImage.get(), 0));

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 139884: 243648 | 244176