Title: [231856] branches/safari-606.1.17-branch/Source/WebKit
- Revision
- 231856
- Author
- bshaf...@apple.com
- Date
- 2018-05-16 11:47:26 -0700 (Wed, 16 May 2018)
Log Message
Cherry-pick r231814. rdar://problem/40267224
Provide UIView and UIImage for zoom transition
https://bugs.webkit.org/show_bug.cgi?id=185655
<rdar://problem/40267224>
Reviewed by Antoine Quint.
Provide a UIView* for the frameForPreviewItem to use as a source view.
Also implement the transitionImageForPreviewItem delegate, even though
we're returning nil.
* UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
(-[_WKPreviewControllerDelegate previewController:frameForPreviewItem:inSourceView:]):
(-[_WKPreviewControllerDelegate previewController:transitionImageForPreviewItem:contentRect:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231814 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606.1.17-branch/Source/WebKit/ChangeLog (231855 => 231856)
--- branches/safari-606.1.17-branch/Source/WebKit/ChangeLog 2018-05-16 18:47:23 UTC (rev 231855)
+++ branches/safari-606.1.17-branch/Source/WebKit/ChangeLog 2018-05-16 18:47:26 UTC (rev 231856)
@@ -1,5 +1,41 @@
2018-05-16 Babak Shafiei <bshaf...@apple.com>
+ Cherry-pick r231814. rdar://problem/40267224
+
+ Provide UIView and UIImage for zoom transition
+ https://bugs.webkit.org/show_bug.cgi?id=185655
+ <rdar://problem/40267224>
+
+ Reviewed by Antoine Quint.
+
+ Provide a UIView* for the frameForPreviewItem to use as a source view.
+ Also implement the transitionImageForPreviewItem delegate, even though
+ we're returning nil.
+
+ * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
+ (-[_WKPreviewControllerDelegate previewController:frameForPreviewItem:inSourceView:]):
+ (-[_WKPreviewControllerDelegate previewController:transitionImageForPreviewItem:contentRect:]):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231814 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-05-15 Dean Jackson <d...@apple.com>
+
+ Provide UIView and UIImage for zoom transition
+ https://bugs.webkit.org/show_bug.cgi?id=185655
+ <rdar://problem/40267224>
+
+ Reviewed by Antoine Quint.
+
+ Provide a UIView* for the frameForPreviewItem to use as a source view.
+ Also implement the transitionImageForPreviewItem delegate, even though
+ we're returning nil.
+
+ * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
+ (-[_WKPreviewControllerDelegate previewController:frameForPreviewItem:inSourceView:]):
+ (-[_WKPreviewControllerDelegate previewController:transitionImageForPreviewItem:contentRect:]):
+
+2018-05-16 Babak Shafiei <bshaf...@apple.com>
+
Cherry-pick r231783. rdar://problem/40230277
Use the system font by default in extra zoom mode
Modified: branches/safari-606.1.17-branch/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm (231855 => 231856)
--- branches/safari-606.1.17-branch/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2018-05-16 18:47:23 UTC (rev 231855)
+++ branches/safari-606.1.17-branch/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2018-05-16 18:47:26 UTC (rev 231856)
@@ -137,6 +137,7 @@
if (!presentingViewController)
return CGRectZero;
+ *view = presentingViewController.view;
CGRect frame = presentingViewController.view.frame;
// Create a smaller rectangle centered in the frame.
CGFloat halfWidth = frame.size.width / 2;
@@ -145,6 +146,11 @@
return frame;
}
+- (UIImage *)previewController:(QLPreviewController *)controller transitionImageForPreviewItem:(id <QLPreviewItem>)item contentRect:(CGRect *)contentRect
+{
+ return nil;
+}
+
@end
namespace WebKit {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
