<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[186090] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186090">186090</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-06-29 15:42:01 -0700 (Mon, 29 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the build.
* editing/cocoa/HTMLConverter.mm:
* platform/spi/cocoa/NSAttributedStringSPI.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaHTMLConvertermm">trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNSAttributedStringSPIh">trunk/Source/WebCore/platform/spi/cocoa/NSAttributedStringSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186089 => 186090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-29 22:35:36 UTC (rev 186089)
+++ trunk/Source/WebCore/ChangeLog 2015-06-29 22:42:01 UTC (rev 186090)
</span><span class="lines">@@ -2,8 +2,21 @@
</span><span class="cx">
</span><span class="cx"> Fix the build.
</span><span class="cx">
</span><ins>+ * editing/cocoa/HTMLConverter.mm:
</ins><span class="cx"> * platform/spi/cocoa/NSAttributedStringSPI.h:
</span><span class="cx">
</span><ins>+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:
+
</ins><span class="cx"> 2015-06-27 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Font panel doesn't get updated when bolding text via cmd+b in Mail on OS X
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (186089 => 186090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2015-06-29 22:35:36 UTC (rev 186089)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2015-06-29 22:42:01 UTC (rev 186090)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx"> SOFT_LINK_FRAMEWORK(UIKit)
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIColor)
</span><span class="cx">
</span><del>-SOFT_LINK_PRIVATE_FRAMEWORK(UIFoundation)
</del><span class="cx"> SOFT_LINK_CLASS(UIFoundation, UIFont)
</span><span class="cx"> SOFT_LINK_CLASS(UIFoundation, NSColor)
</span><span class="cx"> SOFT_LINK_CLASS(UIFoundation, NSShadow)
</span><span class="lines">@@ -84,65 +83,6 @@
</span><span class="cx"> SOFT_LINK_CLASS(UIFoundation, NSTextTable)
</span><span class="cx"> SOFT_LINK_CLASS(UIFoundation, NSTextTab)
</span><span class="cx">
</span><del>-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()
-
</del><span class="cx"> #define PlatformNSShadow getNSShadowClass()
</span><span class="cx"> #define PlatformNSTextAttachment getNSTextAttachmentClass()
</span><span class="cx"> #define PlatformNSParagraphStyle getNSParagraphStyleClass()
</span><span class="lines">@@ -156,10 +96,6 @@
</span><span class="cx"> #define PlatformFont UIFont
</span><span class="cx"> #define PlatformFontClass getUIFontClass()
</span><span class="cx">
</span><del>-// 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";
</del><span class="cx"> #else
</span><span class="cx">
</span><span class="cx"> #define PlatformNSShadow NSShadow
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNSAttributedStringSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/NSAttributedStringSPI.h (186089 => 186090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NSAttributedStringSPI.h 2015-06-29 22:35:36 UTC (rev 186089)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSAttributedStringSPI.h 2015-06-29 22:42:01 UTC (rev 186090)
</span><span class="lines">@@ -49,11 +49,68 @@
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_CONSTANT(UIFoundation, NSFontAttributeName, NSString *)
</span><span class="cx"> #define NSFontAttributeName getNSFontAttributeName()
</span><ins>+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()
</ins><span class="cx"> SOFT_LINK_CONSTANT(UIFoundation, NSUnderlineStyleAttributeName, NSString *)
</span><span class="cx"> #define NSUnderlineStyleAttributeName getNSUnderlineStyleAttributeName()
</span><span class="cx"> SOFT_LINK_CONSTANT(UIFoundation, NSStrikethroughStyleAttributeName, NSString *)
</span><span class="cx"> #define NSStrikethroughStyleAttributeName getNSStrikethroughStyleAttributeName()
</span><ins>+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()
</ins><span class="cx">
</span><ins>+// 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";
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>