Changeset 244941 in webkit

Timestamp:

May 3, 2019 6:01:49 PM (5 years ago)

Author:

dino@apple.com

Message:

Make imageForElementActionType a class method on _WKElementAction
​https://bugs.webkit.org/show_bug.cgi?id=197588
<rdar://problem/50463157>

Reviewed by Wenson Hsieh.

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.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/_WKElementAction.h (modified) (2 diffs)
• UIProcess/API/Cocoa/_WKElementAction.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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 Wenson Hsieh.
+
+        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-03  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h

@@ -60 +60 @@
 + (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));
 
@@ -68 +70 @@
 @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

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm

@@ -38 +38 @@
 #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)
@@ -176 +180 @@
 }
 
-@end
-
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKElementActionAdditions.m>)
-#include <WebKitAdditions/WKElementActionAdditions.m>
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKElementActionAdditions.mm>)
+#include <WebKitAdditions/WKElementActionAdditions.mm>
 #else
-UIImage *_WKUIImageForElementActionType(_WKElementActionType)
++ (UIImage *)imageForElementActionType:(_WKElementActionType)actionType
 {
     return nil;
@@ -187 +189 @@
 #endif
 
+@end
+
 #endif // PLATFORM(IOS_FAMILY)