Changeset 254585 in webkit

Timestamp:

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

Author:

Alan Coon

Message:

Cherry-pick r254067. rdar://problem/58552878

REGRESSION(r247626): Introduced memory regression
​https://bugs.webkit.org/show_bug.cgi?id=205815

Unreviewed rollout of ​https://trac.webkit.org/changeset/247626/webkit.

• platform/graphics/cocoa/FontCacheCoreText.cpp: (WebCore::FontCache::prewarmGlobally): (WebCore::fontFamiliesForPrewarming): Deleted.

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

Location:

branches/safari-609-branch/Source/WebCore

Files:

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

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

@@ +1 @@
+2020-01-14  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r254067. rdar://problem/58552878
+
+    REGRESSION(r247626): Introduced memory regression
+    https://bugs.webkit.org/show_bug.cgi?id=205815
+    
+    Unreviewed rollout of https://trac.webkit.org/changeset/247626/webkit.
+    
+    * platform/graphics/cocoa/FontCacheCoreText.cpp:
+    (WebCore::FontCache::prewarmGlobally):
+    (WebCore::fontFamiliesForPrewarming): Deleted.
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254067 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-01-06  Per Arne Vollan  <pvollan@apple.com>
+
+            REGRESSION(r247626): Introduced memory regression
+            https://bugs.webkit.org/show_bug.cgi?id=205815
+
+            Unreviewed rollout of https://trac.webkit.org/changeset/247626/webkit.
+
+            * platform/graphics/cocoa/FontCacheCoreText.cpp:
+            (WebCore::FontCache::prewarmGlobally):
+            (WebCore::fontFamiliesForPrewarming): Deleted.
+
 2020-01-14  Alan Coon  <alancoon@apple.com>
 

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

@@ -1689 +1689 @@
 }
 
-static Vector<String>& fontFamiliesForPrewarming()
-{
-    static NeverDestroyed<Vector<String>> families = std::initializer_list<String> {
+void FontCache::prewarmGlobally()
+{
+    if (MemoryPressureHandler::singleton().isUnderMemoryPressure())
+        return;
+
+    Vector<String> families = std::initializer_list<String> {
         ".SF NS Text"_s,
         ".SF NS Display"_s,
@@ -1701 +1704 @@
         "Times New Roman"_s,
     };
-    return families;
-}
-
-void FontCache::prewarmGlobally()
-{
-    if (MemoryPressureHandler::singleton().isUnderMemoryPressure())
-        return;
 
     FontCache::PrewarmInformation prewarmInfo;
-    prewarmInfo.seenFamilies = fontFamiliesForPrewarming();
-    prewarmInfo.fontNamesRequiringSystemFallback = fontFamiliesForPrewarming();
+    prewarmInfo.seenFamilies = WTFMove(families);
     FontCache::singleton().prewarm(prewarmInfo);
 }