Title: [248340] branches/safari-608.1-branch/Source/WebKit
- Revision
- 248340
- Author
- [email protected]
- Date
- 2019-08-06 23:51:59 -0700 (Tue, 06 Aug 2019)
Log Message
Cherry-pick r247635. rdar://problem/54017879
Fix warning when importing WebKit in Swift
https://bugs.webkit.org/show_bug.cgi?id=199914
<rdar://problem/52854930>
Patch by Alex Christensen <[email protected]> on 2019-07-18
Reviewed by Wenson Hsieh.
* UIProcess/API/Cocoa/NSAttributedString.h:
Declare NSAttributedString and update a swift name.
This fix was proposed by Argyrios Kyrtzidis.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247635 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608.1-branch/Source/WebKit/ChangeLog (248339 => 248340)
--- branches/safari-608.1-branch/Source/WebKit/ChangeLog 2019-08-07 04:17:29 UTC (rev 248339)
+++ branches/safari-608.1-branch/Source/WebKit/ChangeLog 2019-08-07 06:51:59 UTC (rev 248340)
@@ -1,5 +1,34 @@
2019-08-06 Kocsen Chung <[email protected]>
+ Cherry-pick r247635. rdar://problem/54017879
+
+ Fix warning when importing WebKit in Swift
+ https://bugs.webkit.org/show_bug.cgi?id=199914
+ <rdar://problem/52854930>
+
+ Patch by Alex Christensen <[email protected]> on 2019-07-18
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/API/Cocoa/NSAttributedString.h:
+ Declare NSAttributedString and update a swift name.
+ This fix was proposed by Argyrios Kyrtzidis.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247635 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-07-18 Alex Christensen <[email protected]>
+
+ Fix warning when importing WebKit in Swift
+ https://bugs.webkit.org/show_bug.cgi?id=199914
+ <rdar://problem/52854930>
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/API/Cocoa/NSAttributedString.h:
+ Declare NSAttributedString and update a swift name.
+ This fix was proposed by Argyrios Kyrtzidis.
+
+2019-08-06 Kocsen Chung <[email protected]>
+
Cherry-pick r247838. rdar://problem/53973599
WebKit/UIProcess/ios/WKContentViewInteraction.mm: error: implementing deprecated method contextMenuInteractionWillPresent
Modified: branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/NSAttributedString.h (248339 => 248340)
--- branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/NSAttributedString.h 2019-08-07 04:17:29 UTC (rev 248339)
+++ branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/NSAttributedString.h 2019-08-07 06:51:59 UTC (rev 248340)
@@ -32,6 +32,8 @@
#import <AppKit/NSAttributedString.h>
#endif
+@class NSAttributedString;
+
NS_ASSUME_NONNULL_BEGIN
/*!
@@ -41,7 +43,7 @@
directory may be loaded by WebKit.
*/
WK_EXTERN NSAttributedStringDocumentReadingOptionKey const NSReadAccessURLDocumentOption
- NS_SWIFT_NAME(NSAttributedStringDocumentReadingOptionKey.readAccessURL) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+ NS_SWIFT_NAME(readAccessURL) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
/*!
@abstract Type definition for the completion handler block used to get asynchronous attributed strings.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
