Title: [248580] branches/safari-608-branch/Source/WebCore/PAL
Revision
248580
Author
[email protected]
Date
2019-08-12 16:42:59 -0700 (Mon, 12 Aug 2019)

Log Message

Cherry-pick r248081. rdar://problem/54223700

    Use CTFontCreateForCharactersWithLanguageAndOption if available instead of CTFontCreateForCharactersWithLanguage
    https://bugs.webkit.org/show_bug.cgi?id=200241
    <rdar://problem/53495386>

    Build fix for older MacOS for which CTFontFallbackOption is not defined.
    Unreviewed.

    * pal/spi/cocoa/CoreTextSPI.h:

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

Modified Paths

Diff

Modified: branches/safari-608-branch/Source/WebCore/PAL/ChangeLog (248579 => 248580)


--- branches/safari-608-branch/Source/WebCore/PAL/ChangeLog	2019-08-12 23:42:56 UTC (rev 248579)
+++ branches/safari-608-branch/Source/WebCore/PAL/ChangeLog	2019-08-12 23:42:59 UTC (rev 248580)
@@ -1,5 +1,33 @@
 2019-08-12  Alan Coon  <[email protected]>
 
+        Cherry-pick r248081. rdar://problem/54223700
+
+    Use CTFontCreateForCharactersWithLanguageAndOption if available instead of CTFontCreateForCharactersWithLanguage
+    https://bugs.webkit.org/show_bug.cgi?id=200241
+    <rdar://problem/53495386>
+    
+    Build fix for older MacOS for which CTFontFallbackOption is not defined.
+    Unreviewed.
+    
+    
+    * pal/spi/cocoa/CoreTextSPI.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248081 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-31  Youenn Fablet  <[email protected]>
+
+            Use CTFontCreateForCharactersWithLanguageAndOption if available instead of CTFontCreateForCharactersWithLanguage
+            https://bugs.webkit.org/show_bug.cgi?id=200241
+            <rdar://problem/53495386>
+
+            Build fix for older MacOS for which CTFontFallbackOption is not defined.
+            Unreviewed.
+
+            * pal/spi/cocoa/CoreTextSPI.h:
+
+2019-08-12  Alan Coon  <[email protected]>
+
         Cherry-pick r248469. rdar://problem/54130688
 
     Tapping buttons in Data Detectors lookup previews doesn't work

Modified: branches/safari-608-branch/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h (248579 => 248580)


--- branches/safari-608-branch/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h	2019-08-12 23:42:56 UTC (rev 248579)
+++ branches/safari-608-branch/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h	2019-08-12 23:42:59 UTC (rev 248580)
@@ -132,7 +132,9 @@
 bool CTFontDescriptorIsSystemUIFont(CTFontDescriptorRef);
 CTFontRef CTFontCreateForCSS(CFStringRef name, uint16_t weight, CTFontSymbolicTraits, CGFloat size);
 CTFontRef CTFontCreateForCharactersWithLanguage(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFStringRef language, CFIndex *coveredLength);
+#if HAVE(CTFONTCREATEFORCHARACTERSWITHLANGUAGEANDOPTION)
 CTFontRef CTFontCreateForCharactersWithLanguageAndOption(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFStringRef language, CTFontFallbackOption option, CFIndex *coveredLength);
+#endif
 CTFontRef CTFontCopyPhysicalFont(CTFontRef);
 
 extern const CFStringRef kCTUIFontTextStyleShortHeadline;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to