Changeset 178853 in webkit

Timestamp:

Jan 21, 2015 11:33:14 AM (9 years ago)

Author:

Antti Koivisto

Message:

REGRESSION(r178180): Membuster regressed ~4%
​https://bugs.webkit.org/show_bug.cgi?id=140495

Reviewed by Andreas Kling.

After r178180 we keep system fallback fonts that are used on glyph pages alive.
Previously we would traverse the glyph pages and remove entries referencing system fallbacks.

• platform/graphics/FontCache.cpp:

(WebCore::FontCache::purgeInactiveFontData):

• platform/graphics/FontCascade.cpp:

(WebCore::pruneUnreferencedEntriesFromFontGlyphsCache):
(WebCore::pruneSystemFallbackFonts):

• platform/graphics/FontCascade.h:
• platform/graphics/FontGlyphs.cpp:

(WebCore::FontGlyphs::pruneSystemFallbacks):

When clearing the font cache also remove the cached glyph pages that may contain system fallback fonts
and release the fallbacks.

• platform/graphics/FontGlyphs.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontCache.cpp (modified) (1 diff)
• platform/graphics/FontCascade.cpp (modified) (1 diff)
• platform/graphics/FontCascade.h (modified) (1 diff)
• platform/graphics/FontGlyphs.cpp (modified) (1 diff)
• platform/graphics/FontGlyphs.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-01-20  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r178180): Membuster regressed ~4%
+        https://bugs.webkit.org/show_bug.cgi?id=140495
+
+        Reviewed by Andreas Kling.
+
+        After r178180 we keep system fallback fonts that are used on glyph pages alive.
+        Previously we would traverse the glyph pages and remove entries referencing system fallbacks.
+
+        * platform/graphics/FontCache.cpp:
+        (WebCore::FontCache::purgeInactiveFontData):
+        * platform/graphics/FontCascade.cpp:
+        (WebCore::pruneUnreferencedEntriesFromFontGlyphsCache):
+        (WebCore::pruneSystemFallbackFonts):
+        * platform/graphics/FontCascade.h:
+        * platform/graphics/FontGlyphs.cpp:
+        (WebCore::FontGlyphs::pruneSystemFallbacks):
+
+            When clearing the font cache also remove the cached glyph pages that may contain system fallback fonts
+            and release the fallbacks.
+
+        * platform/graphics/FontGlyphs.h:
+
 2015-01-21  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/Source/WebCore/platform/graphics/FontCache.cpp

@@ -428 +428 @@
 {
     pruneUnreferencedEntriesFromFontGlyphsCache();
+    pruneSystemFallbackFonts();
 
 #if PLATFORM(IOS)

trunk/Source/WebCore/platform/graphics/FontCascade.cpp

@@ -288 +288 @@
 void pruneUnreferencedEntriesFromFontGlyphsCache()
 {
-    Vector<unsigned, 50> toRemove;
-    FontGlyphsCache::iterator end = fontGlyphsCache().end();
-    for (FontGlyphsCache::iterator it = fontGlyphsCache().begin(); it != end; ++it) {
-        if (it->value->glyphs.get().hasOneRef())
-            toRemove.append(it->key);
-    }
-    for (unsigned i = 0; i < toRemove.size(); ++i)
-        fontGlyphsCache().remove(toRemove[i]);
+    fontGlyphsCache().removeIf([](FontGlyphsCache::KeyValuePairType& entry) {
+        return entry.value->glyphs.get().hasOneRef();
+    });
+}
+
+void pruneSystemFallbackFonts()
+{
+    for (auto& entry : fontGlyphsCache().values())
+        entry->glyphs->pruneSystemFallbacks();
 }
 

trunk/Source/WebCore/platform/graphics/FontCascade.h

@@ -346 +346 @@
 void invalidateFontGlyphsCache();
 void pruneUnreferencedEntriesFromFontGlyphsCache();
+void pruneSystemFallbackFonts();
 void clearWidthCaches();
 

trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp

@@ -393 +393 @@
 }
 
-}
+void FontGlyphs::pruneSystemFallbacks()
+{
+    if (m_systemFallbackFontDataSet.isEmpty())
+        return;
+    // Mutable glyph pages may reference fallback fonts.
+    if (m_cachedPageZero && !m_cachedPageZero->isImmutable())
+        m_cachedPageZero = nullptr;
+    m_cachedPages.removeIf([](decltype(m_cachedPages)::KeyValuePairType& keyAndValue) {
+        return !keyAndValue.value->isImmutable();
+    });
+    m_systemFallbackFontDataSet.clear();
+}
+
+}

trunk/Source/WebCore/platform/graphics/FontGlyphs.h

@@ -70 +70 @@
     WEBCORE_EXPORT const FontRanges& realizeFallbackRangesAt(const FontDescription&, unsigned fallbackIndex);
 
+    void pruneSystemFallbacks();
+
 private:
     FontGlyphs(PassRefPtr<FontSelector>);