Attachment 369030 Details for Bug 197588 – Patch

[patch] Patch

bug-197588-20190504103200.patch (text/plain), 3.34 KB, created by Dean Jackson on 2019-05-03 17:32:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Jackson

Created: 2019-05-03 17:32:01 PDT

Size: 3.34 KB

patch

obsolete

>Subversion Revision: 244915
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 36f579091941fb56b940d33d960d68cc2c13de79..09d30cd2cca3a35302b69e12bdd475d884039556 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-05-03  Dean Jackson  <dino@apple.com>
>+
>+        Make imageForElementActionType a class method on _WKElementAction
>+        https://bugs.webkit.org/show_bug.cgi?id=197588
>+        <rdar://problem/50463157>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make this helper function a class method, so that it can
>+        be more easily detected.
>+
>+        * UIProcess/API/Cocoa/_WKElementAction.h:
>+        * UIProcess/API/Cocoa/_WKElementAction.mm:
>+        (+[_WKElementAction imageForElementActionType:]):
>+        (_WKUIImageForElementActionType): Deleted.
>+
> 2019-05-02  Dean Jackson  <dino@apple.com>
> 
>         Need additional UIPreviewAction information in WKImagePreviewViewController
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h b/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h
>index 958a63ff977617ff7d256904ae6c8bb50b12e646..454dc6a13a26e5ac18bad2984ae09783de86d51c 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h
>@@ -59,6 +59,8 @@ WK_CLASS_AVAILABLE(macos(10.10), ios(8.0))
> + (instancetype)elementActionWithType:(_WKElementActionType)type customTitle:(NSString *)title;
> + (instancetype)elementActionWithTitle:(NSString *)title actionHandler:(WKElementActionHandler)handler;
> 
>++ (UIImage *)imageForElementActionType:(_WKElementActionType)actionType WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
>+
> - (void)runActionWithElementInfo:(_WKActivatedElementInfo *)info WK_API_AVAILABLE(ios(9_0));
> 
> @property (nonatomic, readonly) _WKElementActionType type;
>@@ -67,14 +69,4 @@ WK_CLASS_AVAILABLE(macos(10.10), ios(8.0))
> 
> @end
> 
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>-
>-WK_EXPORT UIImage *_WKUIImageForElementActionType(_WKElementActionType) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
>-
>-#ifdef __cplusplus
>-}
>-#endif
>-
> #endif // TARGET_OS_IPHONE
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm
>index 512239ad98b05436ba8051e85ba4d61a190db892..6247a7a700a8361d73e2d7a88c1f17d38763ac2b 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm
>@@ -38,6 +38,10 @@
> #import <wtf/WeakObjCPtr.h>
> #import <wtf/text/WTFString.h>
> 
>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKElementActionAdditions.h>)
>+#include <WebKitAdditions/WKElementActionAdditions.h>
>+#endif
>+
> #if HAVE(SAFARI_SERVICES_FRAMEWORK)
> #import <SafariServices/SSReadingList.h>
> SOFT_LINK_FRAMEWORK(SafariServices);
>@@ -175,15 +179,15 @@ static void addToReadingList(NSURL *targetURL, NSString *title)
>     [self _runActionWithElementInfo:info forActionSheetAssistant:_defaultActionSheetAssistant.get().get()];
> }
> 
>-@end
>-
> #if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKElementActionAdditions.m>)
> #include <WebKitAdditions/WKElementActionAdditions.m>
> #else
>-UIImage *_WKUIImageForElementActionType(_WKElementActionType)
>++ (UIImage *)imageForElementActionType:(_WKElementActionType)actionType
> {
>     return nil;
> }
> #endif
> 
>+@end
>+
> #endif // PLATFORM(IOS_FAMILY)

Flags:

wenson_hsieh: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 197588: 369030