Changeset 254589 in webkit

Timestamp:

Jan 15, 2020, 11:14:45 AM (7 years ago)

Author:

Alan Coon

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

Location:

branches/safari-609-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/FontCacheCoreText.cpp (modified) (1 diff)

branches/safari-609-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-14  Alan Coon  <alancoon@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  <pvollan@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  <alancoon@apple.com>
 

branches/safari-609-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

@@ -1695 +1695 @@
 
     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,