View snapshots are sometimes taken at the wrong scale

https://bugs.webkit.org/show_bug.cgi?id=133419
<rdar://problem/17087497>

Reviewed by Sam Weinig.

* UIProcess/API/mac/WKView.mm:
(-[WKView _takeViewSnapshot]):
Work around <rdar://problem/17084993> by re-requesting the snapshot at
kCGWindowImageNominalResolution if it was captured at the wrong scale.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@169510 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 52df018c8da6789619cf4b3695c2517e65f29f65..298d3d0a863faec224509b0bcc28f66afeb902b9 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2014-05-31  Timothy Horton  <timothy_horton@apple.com>
+
+        View snapshots are sometimes taken at the wrong scale
+        https://bugs.webkit.org/show_bug.cgi?id=133419
+        <rdar://problem/17087497>
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _takeViewSnapshot]):
+        Work around <rdar://problem/17084993> by re-requesting the snapshot at
+        kCGWindowImageNominalResolution if it was captured at the wrong scale.
+
 2014-05-31  Dan Bernstein  <mitz@apple.com>
 
         [iOS] WebKit2.framework is unused

diff --git a/Source/WebKit2/UIProcess/API/mac/WKView.mm b/Source/WebKit2/UIProcess/API/mac/WKView.mm
index 00f0912e632638c6c3489c57ab85d62fbc66aaed..22ec7a2a1114694ab364d0ee082bf4f78f891258 100644 (file)
--- a/Source/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/Source/WebKit2/UIProcess/API/mac/WKView.mm
@@ -126,7 +126,6 @@
 
 #if defined(__has_include) && __has_include(<CoreGraphics/CoreGraphicsPrivate.h>)
 #import <CoreGraphics/CoreGraphicsPrivate.h>
-#import <CoreGraphics/CGSCapture.h>
 #endif
 
 extern "C" {
@@ -134,7 +133,6 @@ typedef uint32_t CGSConnectionID;
 typedef uint32_t CGSWindowID;
 CGSConnectionID CGSMainConnectionID(void);
 CGError CGSGetScreenRectForWindow(CGSConnectionID cid, CGSWindowID wid, CGRect *rect);
-CGError CGSCaptureWindowsContentsToRect(CGSConnectionID cid, const CGSWindowID windows[], uint32_t windowCount, CGRect rect, CGImageRef *outImage);
 };
 
 using namespace WebKit;
@@ -3053,14 +3051,16 @@ static void createSandboxExtensionsForFileUpload(NSPasteboard *pasteboard, Sandb
 
     ViewSnapshot snapshot;
 
-    if (![window windowNumber])
+    CGSWindowID windowID = (CGSWindowID)[window windowNumber];
+    if (!windowID)
         return snapshot;
 
-    // FIXME: This should use CGWindowListCreateImage once <rdar://problem/15709646> is resolved.
-    CGSWindowID windowID = [window windowNumber];
-    CGImageRef cgWindowImage = nullptr;
-    CGSCaptureWindowsContentsToRect(CGSMainConnectionID(), &windowID, 1, CGRectNull, &cgWindowImage);
-    RetainPtr<CGImageRef> windowSnapshotImage = adoptCF(cgWindowImage);
+    RetainPtr<CGImageRef> windowSnapshotImage = adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, kCGWindowImageBoundsIgnoreFraming | kCGWindowImageShouldBeOpaque));
+
+    // Work around <rdar://problem/17084993>; re-request the snapshot at kCGWindowImageNominalResolution if it was captured at the wrong scale.
+    CGFloat desiredSnapshotWidth = window.frame.size.width * window.screen.backingScaleFactor;
+    if (CGImageGetWidth(windowSnapshotImage.get()) != desiredSnapshotWidth)
+        windowSnapshotImage = adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, kCGWindowImageBoundsIgnoreFraming | kCGWindowImageShouldBeOpaque | kCGWindowImageNominalResolution));
 
     [self _ensureGestureController];