Title: [247575] branches/safari-608-branch/Source/WebCore
Revision
247575
Author
kocsen_ch...@apple.com
Date
2019-07-18 13:22:54 -0700 (Thu, 18 Jul 2019)

Log Message

Cherry-pick r247379. rdar://problem/53229731

    Fix builds where HAVE_DESIGN_SYSTEM_UI_FONTS is not defined.

    * platform/graphics/cocoa/FontCacheCoreText.cpp:
    (WebCore::fontWithFamilySpecialCase):

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

Modified Paths

Diff

Modified: branches/safari-608-branch/Source/WebCore/ChangeLog (247574 => 247575)


--- branches/safari-608-branch/Source/WebCore/ChangeLog	2019-07-18 20:22:50 UTC (rev 247574)
+++ branches/safari-608-branch/Source/WebCore/ChangeLog	2019-07-18 20:22:54 UTC (rev 247575)
@@ -1,5 +1,23 @@
 2019-07-17  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r247379. rdar://problem/53229731
+
+    Fix builds where HAVE_DESIGN_SYSTEM_UI_FONTS is not defined.
+    
+    * platform/graphics/cocoa/FontCacheCoreText.cpp:
+    (WebCore::fontWithFamilySpecialCase):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247379 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-11  Simon Fraser  <simon.fra...@apple.com>
+
+            Fix builds where HAVE_DESIGN_SYSTEM_UI_FONTS is not defined.
+
+            * platform/graphics/cocoa/FontCacheCoreText.cpp:
+            (WebCore::fontWithFamilySpecialCase):
+
+2019-07-17  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r247377. rdar://problem/53229731
 
     New York font erroneously gets synthetic bold

Modified: branches/safari-608-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (247574 => 247575)


--- branches/safari-608-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp	2019-07-18 20:22:50 UTC (rev 247574)
+++ branches/safari-608-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp	2019-07-18 20:22:54 UTC (rev 247575)
@@ -1266,6 +1266,11 @@
         if (!cascadeList.isEmpty())
             return createFontForInstalledFonts(cascadeList[0].get(), size, allowUserInstalledFonts);
     }
+#else
+    UNUSED_PARAM(family);
+    UNUSED_PARAM(fontDescription);
+    UNUSED_PARAM(size);
+    UNUSED_PARAM(allowUserInstalledFonts);
 #endif
 
     return nullptr;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to