Attachment 368865 Details for Bug 197540 – Patch

[patch] Patch

bug-197540-20190503120127.patch (text/plain), 2.40 KB, created by Dean Jackson on 2019-05-02 19:01:28 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Jackson

Created: 2019-05-02 19:01:28 PDT

Size: 2.40 KB

patch

obsolete

>Subversion Revision: 244839
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index d9934a1391edbe6de20f0f7e3ed4dcc0b7ad75b1..7a1dd8a896acbb712b0a3e2ef7b121fdb5a45732 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-05-02  Dean Jackson  <dino@apple.com>
>+
>+        Provide UIImages for element actions
>+        https://bugs.webkit.org/show_bug.cgi?id=197539
>+        <rdar://problem/50430363>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use an additions include to export a function that
>+        relates a UIImage to a _WKElementAction.
>+
>+        * UIProcess/API/Cocoa/_WKElementAction.h:
>+        * UIProcess/API/Cocoa/_WKElementAction.mm:
>+        (_WKUIImageForElementActionType):
>+
> 2019-05-01  Dean Jackson  <dino@apple.com>
> 
>         Link Previews that use WKImagePreviewViewController are not always scaled correctly
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h b/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h
>index 15885eac709cfdf608425f697c1999adc1c2f55c..d22fb7a1ba5866880ee5d5374a36aa35ef0536c7 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h
>@@ -27,6 +27,8 @@
> 
> #if TARGET_OS_IPHONE
> 
>+#import <UIKit/UIImage.h>
>+#import <WebKit/WKBase.h>
> #import <WebKit/_WKActivatedElementInfo.h>
> 
> typedef void (^WKElementActionHandler)(_WKActivatedElementInfo *);
>@@ -64,4 +66,14 @@ 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 8068ee54ea9b78d4587e5bf4cbc963e711d461e6..512239ad98b05436ba8051e85ba4d61a190db892 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm
>@@ -177,4 +177,13 @@ static void addToReadingList(NSURL *targetURL, NSString *title)
> 
> @end
> 
>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKElementActionAdditions.m>)
>+#include <WebKitAdditions/WKElementActionAdditions.m>
>+#else
>+UIImage *_WKUIImageForElementActionType(_WKElementActionType)
>+{
>+    return nil;
>+}
>+#endif
>+
> #endif // PLATFORM(IOS_FAMILY)

Actions: View | Formatted Diff | Diff

Attachments on bug 197540: 368863 | 368865 | 368866 | 368874