Title: [254067] trunk/Source/WebCore
- Revision
- 254067
- Author
- pvol...@apple.com
- Date
- 2020-01-06 11:16:18 -0800 (Mon, 06 Jan 2020)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (254066 => 254067)
--- trunk/Source/WebCore/ChangeLog 2020-01-06 19:00:42 UTC (rev 254066)
+++ trunk/Source/WebCore/ChangeLog 2020-01-06 19:16:18 UTC (rev 254067)
@@ -1,3 +1,14 @@
+2020-01-06 Per Arne Vollan <pvol...@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-06 Yusuke Suzuki <ysuz...@apple.com>
[WebCore] Shrink sizeof(RuleFeature)
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (254066 => 254067)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2020-01-06 19:00:42 UTC (rev 254066)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2020-01-06 19:16:18 UTC (rev 254067)
@@ -1688,9 +1688,12 @@
});
}
-static Vector<String>& fontFamiliesForPrewarming()
+void FontCache::prewarmGlobally()
{
- static NeverDestroyed<Vector<String>> families = std::initializer_list<String> {
+ if (MemoryPressureHandler::singleton().isUnderMemoryPressure())
+ return;
+
+ Vector<String> families = std::initializer_list<String> {
".SF NS Text"_s,
".SF NS Display"_s,
"Arial"_s,
@@ -1700,17 +1703,9 @@
"Times"_s,
"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);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
