Title: [254589] branches/safari-609-branch/Source/WebCore
Revision
254589
Author
alanc...@apple.com
Date
2020-01-15 11:14:45 -0800 (Wed, 15 Jan 2020)

Log Message

Cherry-pick r254099. rdar://problem/58552889

    [iOS] Only prewarm fonts with valid font names
    https://bugs.webkit.org/show_bug.cgi?id=205822

    Reviewed by Brent Fulgham.

    The font names ".SF NS Text" and ".SF NS Display" are not valid on iOS, and should not be prewarmed.

    No new tests, no behavior change.

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

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

Modified Paths

Diff

Modified: branches/safari-609-branch/Source/WebCore/ChangeLog (254588 => 254589)


--- branches/safari-609-branch/Source/WebCore/ChangeLog	2020-01-15 19:14:42 UTC (rev 254588)
+++ branches/safari-609-branch/Source/WebCore/ChangeLog	2020-01-15 19:14:45 UTC (rev 254589)
@@ -1,5 +1,38 @@
 2020-01-14  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r254099. rdar://problem/58552889
+
+    [iOS] Only prewarm fonts with valid font names
+    https://bugs.webkit.org/show_bug.cgi?id=205822
+    
+    Reviewed by Brent Fulgham.
+    
+    The font names ".SF NS Text" and ".SF NS Display" are not valid on iOS, and should not be prewarmed.
+    
+    No new tests, no behavior change.
+    
+    * platform/graphics/cocoa/FontCacheCoreText.cpp:
+    (WebCore::FontCache::prewarmGlobally):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254099 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-01-06  Per Arne Vollan  <pvol...@apple.com>
+
+            [iOS] Only prewarm fonts with valid font names
+            https://bugs.webkit.org/show_bug.cgi?id=205822
+
+            Reviewed by Brent Fulgham.
+
+            The font names ".SF NS Text" and ".SF NS Display" are not valid on iOS, and should not be prewarmed.
+
+            No new tests, no behavior change.
+
+            * platform/graphics/cocoa/FontCacheCoreText.cpp:
+            (WebCore::FontCache::prewarmGlobally):
+
+2020-01-14  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r254067. rdar://problem/58552878
 
     REGRESSION(r247626): Introduced memory regression

Modified: branches/safari-609-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (254588 => 254589)


--- branches/safari-609-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp	2020-01-15 19:14:42 UTC (rev 254588)
+++ branches/safari-609-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp	2020-01-15 19:14:45 UTC (rev 254589)
@@ -1694,8 +1694,10 @@
         return;
 
     Vector<String> families = std::initializer_list<String> {
+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
         ".SF NS Text"_s,
         ".SF NS Display"_s,
+#endif
         "Arial"_s,
         "Helvetica"_s,
         "Helvetica Neue"_s,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to