<!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>[285821] branches/safari-613.1.8-branch/Source/WebCore/PAL</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/285821">285821</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-11-15 12:15:25 -0800 (Mon, 15 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/285811">r285811</a>. rdar://problem/85422144

    Declare NSTextListMarker* as type NSTextListMarkerFormat when soft-linking
    https://bugs.webkit.org/show_bug.cgi?id=233064
    rdar://85341122

    Reviewed by Tim Horton.

    Followup to <a href="http://trac.webkit.org/projects/webkit/changeset/285744">r285744</a>. Avoid build errors due to defining these constants as a different type of symbol
    (NSString * vs. NSTextListMarkerFormat). To address this, we directly import `NSTextList.h` if it's available in
    the SDK; otherwise, fall back to defining NSTextListMarkerFormat. In both cases, we need to keep soft linking
    each of these constants, since WebCore cannot explicitly link against UIKit.

    * pal/spi/cocoa/NSAttributedStringSPI.h:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285811 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari61318branchSourceWebCorePALChangeLog">branches/safari-613.1.8-branch/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#branchessafari61318branchSourceWebCorePALpalspicocoaNSAttributedStringSPIh">branches/safari-613.1.8-branch/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari61318branchSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.8-branch/Source/WebCore/PAL/ChangeLog (285820 => 285821)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.8-branch/Source/WebCore/PAL/ChangeLog      2021-11-15 20:15:22 UTC (rev 285820)
+++ branches/safari-613.1.8-branch/Source/WebCore/PAL/ChangeLog 2021-11-15 20:15:25 UTC (rev 285821)
</span><span class="lines">@@ -1,5 +1,40 @@
</span><span class="cx"> 2021-11-15  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r285811. rdar://problem/85422144
+
+    Declare NSTextListMarker* as type NSTextListMarkerFormat when soft-linking
+    https://bugs.webkit.org/show_bug.cgi?id=233064
+    rdar://85341122
+    
+    Reviewed by Tim Horton.
+    
+    Followup to r285744. Avoid build errors due to defining these constants as a different type of symbol
+    (NSString * vs. NSTextListMarkerFormat). To address this, we directly import `NSTextList.h` if it's available in
+    the SDK; otherwise, fall back to defining NSTextListMarkerFormat. In both cases, we need to keep soft linking
+    each of these constants, since WebCore cannot explicitly link against UIKit.
+    
+    * pal/spi/cocoa/NSAttributedStringSPI.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285811 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-11-15  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            Declare NSTextListMarker* as type NSTextListMarkerFormat when soft-linking
+            https://bugs.webkit.org/show_bug.cgi?id=233064
+            rdar://85341122
+
+            Reviewed by Tim Horton.
+
+            Followup to r285744. Avoid build errors due to defining these constants as a different type of symbol
+            (NSString * vs. NSTextListMarkerFormat). To address this, we directly import `NSTextList.h` if it's available in
+            the SDK; otherwise, fall back to defining NSTextListMarkerFormat. In both cases, we need to keep soft linking
+            each of these constants, since WebCore cannot explicitly link against UIKit.
+
+            * pal/spi/cocoa/NSAttributedStringSPI.h:
+
+2021-11-15  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r285744. rdar://problem/85422144
</span><span class="cx"> 
</span><span class="cx">     Stop statically declaring various UIFoundation constants in NSAttributedStringSPI.h
</span></span></pre></div>
<a id="branchessafari61318branchSourceWebCorePALpalspicocoaNSAttributedStringSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.8-branch/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h (285820 => 285821)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.8-branch/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h  2021-11-15 20:15:22 UTC (rev 285820)
+++ branches/safari-613.1.8-branch/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h     2021-11-15 20:15:25 UTC (rev 285821)
</span><span class="lines">@@ -95,31 +95,37 @@
</span><span class="cx"> #define NSMarkedClauseSegmentAttributeName getNSMarkedClauseSegmentAttributeName()
</span><span class="cx"> SOFT_LINK_CONSTANT(UIFoundation, NSTextAlternativesAttributeName, NSString *)
</span><span class="cx"> #define NSTextAlternativesAttributeName getNSTextAlternativesAttributeName()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerCircle, NSString *)
</del><ins>+
+#if __has_include(<UIKit/NSTextList.h>)
+#import <UIKit/NSTextList.h>
+#else
+typedef NSString *NSTextListMarkerFormat;
+#endif
+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerCircle, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerCircle getNSTextListMarkerCircle()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerDisc, NSString *)
</del><ins>+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerDisc, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerDisc getNSTextListMarkerDisc()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerSquare, NSString *)
</del><ins>+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerSquare, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerSquare getNSTextListMarkerSquare()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseHexadecimal, NSString *)
</del><ins>+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseHexadecimal, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerLowercaseHexadecimal getNSTextListMarkerLowercaseHexadecimal()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseHexadecimal, NSString *)
</del><ins>+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseHexadecimal, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerUppercaseHexadecimal getNSTextListMarkerUppercaseHexadecimal()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerOctal, NSString *)
</del><ins>+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerOctal, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerOctal getNSTextListMarkerOctal()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseAlpha, NSString *)
</del><ins>+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseAlpha, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerLowercaseAlpha getNSTextListMarkerLowercaseAlpha()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseAlpha, NSString *)
</del><ins>+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseAlpha, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerUppercaseAlpha getNSTextListMarkerUppercaseAlpha()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseLatin, NSString *)
</del><ins>+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseLatin, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerLowercaseLatin getNSTextListMarkerLowercaseLatin()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseLatin, NSString *)
</del><ins>+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseLatin, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerUppercaseLatin getNSTextListMarkerUppercaseLatin()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseRoman, NSString *)
</del><ins>+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerLowercaseRoman, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerLowercaseRoman getNSTextListMarkerLowercaseRoman()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseRoman, NSString *)
</del><ins>+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerUppercaseRoman, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerUppercaseRoman getNSTextListMarkerUppercaseRoman()
</span><del>-SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerDecimal, NSString *)
</del><ins>+SOFT_LINK_CONSTANT(UIFoundation, NSTextListMarkerDecimal, NSTextListMarkerFormat)
</ins><span class="cx"> #define NSTextListMarkerDecimal getNSTextListMarkerDecimal()
</span><span class="cx"> 
</span><span class="cx"> // We don't softlink NSSuperscriptAttributeName because UIFoundation stopped exporting it.
</span></span></pre>
</div>
</div>

</body>
</html>