Changeset 187320 in webkit

Timestamp:

Jul 24, 2015, 12:54:33 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187215. rdar://problem/21032083

Location:

branches/safari-601.1-branch/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/spi/cocoa/QuartzCoreSPI.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• WebKit2/UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)

branches/safari-601.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187215. rdar://problem/21032083
+
+    2015-07-22  James Savage  <james.savage@apple.com>
+
+            Use updated CoreAnimation snapshot SPI.
+            https://bugs.webkit.org/show_bug.cgi?id=147197
+            <rdar://problem/21032083>
+
+            Reviewed by Tim Horton.
+            Patch by James Savage.
+
+            * platform/spi/cocoa/QuartzCoreSPI.h:
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h

@@ -33 +33 @@
 
 #ifdef __OBJC__
+#import <QuartzCore/CADisplay.h>
 #import <QuartzCore/CALayerHost.h>
 #import <QuartzCore/CALayerPrivate.h>
@@ -150 +151 @@
 
 #if USE(IOSURFACE)
-EXTERN_C void CARenderServerRenderLayerWithTransform(mach_port_t server_port, uint32_t client_id, uint64_t layer_id, IOSurfaceRef iosurface, int32_t ox, int32_t oy, const CATransform3D *matrix);
+EXTERN_C void CARenderServerRenderDisplayLayerWithTransformAndTimeOffset(mach_port_t server_port, CFStringRef display_name, uint32_t client_id, uint64_t layer_id, IOSurfaceRef iosurface, int32_t ox, int32_t oy, const CATransform3D *matrix, CFTimeInterval offset);
 #endif
 

branches/safari-601.1-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187215. rdar://problem/21032083
+
+    2015-07-22  James Savage  <james.savage@apple.com>
+
+            Use updated CoreAnimation snapshot SPI.
+            https://bugs.webkit.org/show_bug.cgi?id=147197
+            <rdar://problem/21032083>
+
+            Reviewed by Tim Horton.
+            Patch by James Savage.
+
+            * Platform/spi/ios/UIKitSPI.h:
+            * UIProcess/API/Cocoa/WKWebView.mm:
+            (-[WKWebView _snapshotRect:intoImageOfWidth:completionHandler:]):
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h

@@ -248 +248 @@
 @end
 
+@class CADisplay;
+@interface UIScreen (Details)
+- (CADisplay *)_display;
+@end
+
 @interface UIScrollView (Details)
 - (void)_stopScrollingAndZoomingAnimations;

branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -2891 +2891 @@
 #if USE(IOSURFACE)
     // If we are parented and thus won't incur a significant penalty from paging in tiles, snapshot the view hierarchy directly.
-    if (self.window) {
+    if (CADisplay *display = self.window.screen._display) {
         auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(WebCore::FloatSize(imageSize)), WebCore::ColorSpaceDeviceRGB);
         CGFloat imageScaleInViewCoordinates = imageWidth / rectInViewCoordinates.size.width;
         CATransform3D transform = CATransform3DMakeScale(imageScaleInViewCoordinates, imageScaleInViewCoordinates, 1);
         transform = CATransform3DTranslate(transform, -rectInViewCoordinates.origin.x, -rectInViewCoordinates.origin.y, 0);
-        CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform);
+        CARenderServerRenderDisplayLayerWithTransformAndTimeOffset(MACH_PORT_NULL, (CFStringRef)display.name, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform, 0);
         completionHandler(surface->createImage().get());
-
         return;
     }