Changeset 189877 in webkit

Timestamp:

Sep 16, 2015 12:52:17 PM (9 years ago)

Author:

mitz@apple.com

Message:

[iOS] Inline implementation of -[WKImagePreviewViewController previewActions]
​https://bugs.webkit.org/show_bug.cgi?id=149224

Reviewed by Tim Horton.

• Platform/spi/ios/UIKitSPI.h: Declare UIViewControllerPreviewAction and its factory method.
• UIProcess/WKImagePreviewViewController.mm:

(-[WKImagePreviewViewController previewActions]): Moved here.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• UIProcess/WKImagePreviewViewController.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-09-16  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Inline implementation of -[WKImagePreviewViewController previewActions]
+        https://bugs.webkit.org/show_bug.cgi?id=149224
+
+        Reviewed by Tim Horton.
+
+        * Platform/spi/ios/UIKitSPI.h: Declare UIViewControllerPreviewAction and its factory method.
+        * UIProcess/WKImagePreviewViewController.mm:
+        (-[WKImagePreviewViewController previewActions]): Moved here.
+
 2015-09-16  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h

@@ -758 +758 @@
 @end
 
+@interface UIViewControllerPreviewAction : NSObject <NSCopying>
+@end
+
+@interface UIViewControllerPreviewAction ()
++ (instancetype)actionWithTitle:(NSString *)title handler:(void (^)(UIViewControllerPreviewAction *action, UIViewController *previewViewController))handler;
+@end
+
 #endif // USE(APPLE_INTERNAL_SDK)
 

trunk/Source/WebKit2/UIProcess/WKImagePreviewViewController.mm

@@ -92 +92 @@
 }
 
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKImagePreviewViewController.mm>
+#if HAVE(LINK_PREVIEW)
+- (NSArray <UIViewControllerPreviewAction *> *)previewActions
+{
+    NSMutableArray<UIViewControllerPreviewAction *> *previewActions = [NSMutableArray array];
+    for (_WKElementAction *imageAction in _imageActions.get()) {
+        UIViewControllerPreviewAction *previewAction = [UIViewControllerPreviewAction actionWithTitle:imageAction.title handler:^(UIViewControllerPreviewAction *action, UIViewController *previewViewController) {
+            if ([imageAction respondsToSelector:@selector(runActionWithElementInfo:)])
+                [imageAction runActionWithElementInfo:_activatedElementInfo.get()];
+        }];
+
+        [previewActions addObject:previewAction];
+    }
+
+    return previewActions;
+}
 #endif