Changeset 248340 in webkit

Timestamp:

Aug 6, 2019, 11:51:59 PM (7 years ago)

Author:

Kocsen Chung

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 <​achristensen@webkit.org> 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

Location:

branches/safari-608.1-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/NSAttributedString.h (modified) (2 diffs)

branches/safari-608.1-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-06  Kocsen Chung  <kocsen_chung@apple.com>
+
+        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 <achristensen@webkit.org> 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  <achristensen@webkit.org>
+
+            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  <kocsen_chung@apple.com>
 

branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/NSAttributedString.h

@@ -33 +33 @@
 #endif
 
+@class NSAttributedString;
+
 NS_ASSUME_NONNULL_BEGIN
 
@@ -42 +44 @@
 */
 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));
 
 /*!