Changeset 231856 in webkit

Timestamp:

May 16, 2018 11:47:26 AM (6 years ago)

Author:

bshafiei@apple.com

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

Location:

branches/safari-606.1.17-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/SystemPreviewControllerCocoa.mm (modified) (2 diffs)

branches/safari-606.1.17-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-16  Babak Shafiei  <bshafiei@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  <dino@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  <bshafiei@apple.com>
 

branches/safari-606.1.17-branch/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm

@@ -138 +138 @@
         return CGRectZero;
 
+    *view = presentingViewController.view;
     CGRect frame = presentingViewController.view.frame;
     // Create a smaller rectangle centered in the frame.
@@ -146 +147 @@
 }
 
+- (UIImage *)previewController:(QLPreviewController *)controller transitionImageForPreviewItem:(id <QLPreviewItem>)item contentRect:(CGRect *)contentRect
+{
+    return nil;
+}
+
 @end