Changeset 247626 in webkit

Timestamp:

Jul 18, 2019 5:07:52 PM (5 years ago)

Author:

pvollan@apple.com

Message:

Prewarm font cache with more fonts
​https://bugs.webkit.org/show_bug.cgi?id=199283

Reviewed by Myles C. Maxfield.

Initialize the list of families requiring system fallback in the prewarming information struct, since
this was part of the original, approved patch, and is needed for the performance improvement.

No new tests, covered by existing tests.

• platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::fontFamiliesForPrewarming):
(WebCore::FontCache::prewarmGlobally):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-18  Per Arne Vollan  <pvollan@apple.com>
+
+        Prewarm font cache with more fonts
+        https://bugs.webkit.org/show_bug.cgi?id=199283
+
+        Reviewed by Myles C. Maxfield.
+
+        Initialize the list of families requiring system fallback in the prewarming information struct, since
+        this was part of the original, approved patch, and is needed for the performance improvement.
+
+        No new tests, covered by existing tests.
+
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::fontFamiliesForPrewarming):
+        (WebCore::FontCache::prewarmGlobally):
+
 2019-07-18  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

@@ -1650 +1650 @@
 }
 
-void FontCache::prewarmGlobally()
-{
-    if (MemoryPressureHandler::singleton().isUnderMemoryPressure())
-        return;
-
-    Vector<String> families = std::initializer_list<String> {
+static Vector<String>& fontFamiliesForPrewarming()
+{
+    static NeverDestroyed<Vector<String>> families = std::initializer_list<String> {
         "Arial"_s,
         "Helvetica"_s,
@@ -1663 +1660 @@
         "Times New Roman"_s,
     };
+    return families;
+}
+
+void FontCache::prewarmGlobally()
+{
+    if (MemoryPressureHandler::singleton().isUnderMemoryPressure())
+        return;
 
     FontCache::PrewarmInformation prewarmInfo;
-    prewarmInfo.seenFamilies = WTFMove(families);
+    prewarmInfo.seenFamilies = fontFamiliesForPrewarming();
+    prewarmInfo.fontNamesRequiringSystemFallback = fontFamiliesForPrewarming();
     FontCache::singleton().prewarm(prewarmInfo);
 }