Changeset 162936 in webkit

Timestamp:

Jan 28, 2014 9:19:05 AM (10 years ago)

Author:

timothy_horton@apple.com

Message:

WebKit2 View Gestures (Swipe): Use CGSCaptureWindowsContentsToRect for now
​https://bugs.webkit.org/show_bug.cgi?id=127768
<rdar://problem/15923662>

Reviewed by Simon Fraser.

• UIProcess/API/mac/WKView.mm:

(-[WKView _takeViewSnapshot]):
Until <rdar://problem/15709646> is resolved, we'll use
CGSCaptureWindowsContentsToRect instead of CGWindowListCreateImage.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-28  Tim Horton  <timothy_horton@apple.com>
+
+        WebKit2 View Gestures (Swipe): Use CGSCaptureWindowsContentsToRect for now
+        https://bugs.webkit.org/show_bug.cgi?id=127768
+        <rdar://problem/15923662>
+
+        Reviewed by Simon Fraser.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _takeViewSnapshot]):
+        Until <rdar://problem/15709646> is resolved, we'll use
+        CGSCaptureWindowsContentsToRect instead of CGWindowListCreateImage.
+
 2014-01-28  Mark Rowe  <mrowe@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -118 +118 @@
 #if defined(__has_include) && __has_include(<CoreGraphics/CoreGraphicsPrivate.h>)
 #import <CoreGraphics/CoreGraphicsPrivate.h>
+#import <CoreGraphics/CGSCapture.h>
 #endif
 
@@ -125 +126 @@
 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);
 };
 
@@ -2546 +2548 @@
         return nullptr;
 
-    RetainPtr<CGImageRef> windowSnapshotImage = adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, [window windowNumber], kCGWindowImageBoundsIgnoreFraming | kCGWindowImageShouldBeOpaque));
+    // 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);
 
     NSRect windowCaptureRect = [self convertRect:self.bounds toView:nil];