Fix the build.
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Jun 2015 22:42:01 +0000 (22:42 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Jun 2015 22:42:01 +0000 (22:42 +0000)
* editing/cocoa/HTMLConverter.mm:
* platform/spi/cocoa/NSAttributedStringSPI.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@186090 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/editing/cocoa/HTMLConverter.mm
Source/WebCore/platform/spi/cocoa/NSAttributedStringSPI.h

index 5bcdfb7..a9941ef 100644 (file)
@@ -2,6 +2,19 @@
 
         Fix the build.
 
+        * editing/cocoa/HTMLConverter.mm:
+        * platform/spi/cocoa/NSAttributedStringSPI.h:
+
+2015-06-29  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the build.
+
+        * platform/spi/cocoa/NSAttributedStringSPI.h:
+
+2015-06-29  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the build.
+
         * platform/spi/cocoa/NSAttributedStringSPI.h:
 
 2015-06-27  Ryosuke Niwa  <rniwa@webkit.org>
index bb704c5..6a466db 100644 (file)
@@ -71,7 +71,6 @@
 SOFT_LINK_FRAMEWORK(UIKit)
 SOFT_LINK_CLASS(UIKit, UIColor)
 
-SOFT_LINK_PRIVATE_FRAMEWORK(UIFoundation)
 SOFT_LINK_CLASS(UIFoundation, UIFont)
 SOFT_LINK_CLASS(UIFoundation, NSColor)
 SOFT_LINK_CLASS(UIFoundation, NSShadow)
@@ -84,65 +83,6 @@ SOFT_LINK_CLASS(UIFoundation, NSTextTableBlock)
 SOFT_LINK_CLASS(UIFoundation, NSTextTable)
 SOFT_LINK_CLASS(UIFoundation, NSTextTab)
 
-SOFT_LINK_CONSTANT(UIFoundation, NSFontAttributeName, NSString *)
-#define NSFontAttributeName getNSFontAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSForegroundColorAttributeName, NSString *)
-#define NSForegroundColorAttributeName getNSForegroundColorAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSBackgroundColorAttributeName, NSString *)
-#define NSBackgroundColorAttributeName getNSBackgroundColorAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSStrokeColorAttributeName, NSString *)
-#define NSStrokeColorAttributeName getNSStrokeColorAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSStrokeWidthAttributeName, NSString *)
-#define NSStrokeWidthAttributeName getNSStrokeWidthAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSShadowAttributeName, NSString *)
-#define NSShadowAttributeName getNSShadowAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSKernAttributeName, NSString *)
-#define NSKernAttributeName getNSKernAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSLigatureAttributeName, NSString *)
-#define NSLigatureAttributeName getNSLigatureAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSUnderlineStyleAttributeName, NSString *)
-#define NSUnderlineStyleAttributeName getNSUnderlineStyleAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSStrikethroughStyleAttributeName, NSString *)
-#define NSStrikethroughStyleAttributeName getNSStrikethroughStyleAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSBaselineOffsetAttributeName, NSString *)
-#define NSBaselineOffsetAttributeName getNSBaselineOffsetAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSWritingDirectionAttributeName, NSString *)
-#define NSWritingDirectionAttributeName getNSWritingDirectionAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSParagraphStyleAttributeName, NSString *)
-#define NSParagraphStyleAttributeName getNSParagraphStyleAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSAttachmentAttributeName, NSString *)
-#define NSAttachmentAttributeName getNSAttachmentAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSLinkAttributeName, NSString *)
-#define NSLinkAttributeName getNSLinkAttributeName()
-SOFT_LINK_CONSTANT(UIFoundation, NSAuthorDocumentAttribute, NSString *)
-#define NSAuthorDocumentAttribute getNSAuthorDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSEditorDocumentAttribute, NSString *)
-#define NSEditorDocumentAttribute getNSEditorDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSGeneratorDocumentAttribute, NSString *)
-#define NSGeneratorDocumentAttribute getNSGeneratorDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSCompanyDocumentAttribute, NSString *)
-#define NSCompanyDocumentAttribute getNSCompanyDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSDisplayNameDocumentAttribute, NSString *)
-#define NSDisplayNameDocumentAttribute getNSDisplayNameDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSCopyrightDocumentAttribute, NSString *)
-#define NSCopyrightDocumentAttribute getNSCopyrightDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSSubjectDocumentAttribute, NSString *)
-#define NSSubjectDocumentAttribute getNSSubjectDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSCommentDocumentAttribute, NSString *)
-#define NSCommentDocumentAttribute getNSCommentDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSNoIndexDocumentAttribute, NSString *)
-#define NSNoIndexDocumentAttribute getNSNoIndexDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSKeywordsDocumentAttribute, NSString *)
-#define NSKeywordsDocumentAttribute getNSKeywordsDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSCreationTimeDocumentAttribute, NSString *)
-#define NSCreationTimeDocumentAttribute getNSCreationTimeDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSModificationTimeDocumentAttribute, NSString *)
-#define NSModificationTimeDocumentAttribute getNSModificationTimeDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSConvertedDocumentAttribute, NSString *)
-#define NSConvertedDocumentAttribute getNSConvertedDocumentAttribute()
-SOFT_LINK_CONSTANT(UIFoundation, NSCocoaVersionDocumentAttribute, NSString *)
-#define NSCocoaVersionDocumentAttribute getNSCocoaVersionDocumentAttribute()
-
 #define PlatformNSShadow            getNSShadowClass()
 #define PlatformNSTextAttachment    getNSTextAttachmentClass()
 #define PlatformNSParagraphStyle    getNSParagraphStyleClass()
@@ -156,10 +96,6 @@ SOFT_LINK_CONSTANT(UIFoundation, NSCocoaVersionDocumentAttribute, NSString *)
 #define PlatformFont                UIFont
 #define PlatformFontClass           getUIFontClass()
 
-// We don't softlink NSSuperscriptAttributeName because UIFoundation stopped exporting it.
-// This attribute is being deprecated at the API level, but internally UIFoundation
-// will continue to support it.
-static NSString *const NSSuperscriptAttributeName = @"NSSuperscript";
 #else
 
 #define PlatformNSShadow            NSShadow
index b858a8f..e7c2bab 100644 (file)
@@ -49,10 +49,67 @@ SOFT_LINK_PRIVATE_FRAMEWORK(UIFoundation)
 
 SOFT_LINK_CONSTANT(UIFoundation, NSFontAttributeName, NSString *)
 #define NSFontAttributeName getNSFontAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSForegroundColorAttributeName, NSString *)
+#define NSForegroundColorAttributeName getNSForegroundColorAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSBackgroundColorAttributeName, NSString *)
+#define NSBackgroundColorAttributeName getNSBackgroundColorAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSStrokeColorAttributeName, NSString *)
+#define NSStrokeColorAttributeName getNSStrokeColorAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSStrokeWidthAttributeName, NSString *)
+#define NSStrokeWidthAttributeName getNSStrokeWidthAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSShadowAttributeName, NSString *)
+#define NSShadowAttributeName getNSShadowAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSKernAttributeName, NSString *)
+#define NSKernAttributeName getNSKernAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSLigatureAttributeName, NSString *)
+#define NSLigatureAttributeName getNSLigatureAttributeName()
 SOFT_LINK_CONSTANT(UIFoundation, NSUnderlineStyleAttributeName, NSString *)
 #define NSUnderlineStyleAttributeName getNSUnderlineStyleAttributeName()
 SOFT_LINK_CONSTANT(UIFoundation, NSStrikethroughStyleAttributeName, NSString *)
 #define NSStrikethroughStyleAttributeName getNSStrikethroughStyleAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSBaselineOffsetAttributeName, NSString *)
+#define NSBaselineOffsetAttributeName getNSBaselineOffsetAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSWritingDirectionAttributeName, NSString *)
+#define NSWritingDirectionAttributeName getNSWritingDirectionAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSParagraphStyleAttributeName, NSString *)
+#define NSParagraphStyleAttributeName getNSParagraphStyleAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSAttachmentAttributeName, NSString *)
+#define NSAttachmentAttributeName getNSAttachmentAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSLinkAttributeName, NSString *)
+#define NSLinkAttributeName getNSLinkAttributeName()
+SOFT_LINK_CONSTANT(UIFoundation, NSAuthorDocumentAttribute, NSString *)
+#define NSAuthorDocumentAttribute getNSAuthorDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSEditorDocumentAttribute, NSString *)
+#define NSEditorDocumentAttribute getNSEditorDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSGeneratorDocumentAttribute, NSString *)
+#define NSGeneratorDocumentAttribute getNSGeneratorDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSCompanyDocumentAttribute, NSString *)
+#define NSCompanyDocumentAttribute getNSCompanyDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSDisplayNameDocumentAttribute, NSString *)
+#define NSDisplayNameDocumentAttribute getNSDisplayNameDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSCopyrightDocumentAttribute, NSString *)
+#define NSCopyrightDocumentAttribute getNSCopyrightDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSSubjectDocumentAttribute, NSString *)
+#define NSSubjectDocumentAttribute getNSSubjectDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSCommentDocumentAttribute, NSString *)
+#define NSCommentDocumentAttribute getNSCommentDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSNoIndexDocumentAttribute, NSString *)
+#define NSNoIndexDocumentAttribute getNSNoIndexDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSKeywordsDocumentAttribute, NSString *)
+#define NSKeywordsDocumentAttribute getNSKeywordsDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSCreationTimeDocumentAttribute, NSString *)
+#define NSCreationTimeDocumentAttribute getNSCreationTimeDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSModificationTimeDocumentAttribute, NSString *)
+#define NSModificationTimeDocumentAttribute getNSModificationTimeDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSConvertedDocumentAttribute, NSString *)
+#define NSConvertedDocumentAttribute getNSConvertedDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSCocoaVersionDocumentAttribute, NSString *)
+#define NSCocoaVersionDocumentAttribute getNSCocoaVersionDocumentAttribute()
+
+// We don't softlink NSSuperscriptAttributeName because UIFoundation stopped exporting it.
+// This attribute is being deprecated at the API level, but internally UIFoundation
+// will continue to support it.
+static NSString *const NSSuperscriptAttributeName = @"NSSuperscript";
 
 #endif