Title: [187383] trunk/Source/WebKit2
- Revision
- 187383
- Author
- [email protected]
- Date
- 2015-07-24 22:38:22 -0700 (Fri, 24 Jul 2015)
Log Message
iOS 8 build fix attempt after r187215.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _snapshotRect:intoImageOfWidth:completionHandler:]): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (187382 => 187383)
--- trunk/Source/WebKit2/ChangeLog 2015-07-25 05:29:52 UTC (rev 187382)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-25 05:38:22 UTC (rev 187383)
@@ -1,3 +1,10 @@
+2015-07-24 Ryosuke Niwa <[email protected]>
+
+ iOS 8 build fix attempt after r187215.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _snapshotRect:intoImageOfWidth:completionHandler:]): Deleted.
+
2015-07-24 Yongjun Zhang <[email protected]>
Don't create UIWebFormAccessory if we don't require accessory view.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (187382 => 187383)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-07-25 05:29:52 UTC (rev 187382)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-07-25 05:38:22 UTC (rev 187383)
@@ -2920,12 +2920,20 @@
#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 __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
if (CADisplay *display = self.window.screen._display) {
+#else
+ if (self.window) {
+#endif
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);
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
CARenderServerRenderDisplayLayerWithTransformAndTimeOffset(MACH_PORT_NULL, (CFStringRef)display.name, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform, 0);
+#else
+ CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform);
+#endif
completionHandler(surface->createImage().get());
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
