diff options
Diffstat (limited to 'WebCore/css/CSSFontFaceSource.cpp')
| -rw-r--r-- | WebCore/css/CSSFontFaceSource.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/WebCore/css/CSSFontFaceSource.cpp b/WebCore/css/CSSFontFaceSource.cpp index d5dc6ec..aa09b05 100644 --- a/WebCore/css/CSSFontFaceSource.cpp +++ b/WebCore/css/CSSFontFaceSource.cpp @@ -92,7 +92,12 @@ bool CSSFontFaceSource::isValid() const void CSSFontFaceSource::fontLoaded(CachedFont*) { - pruneTable(); + // On Android, rendering and font loading occur on separate threads, so + // pruning from here can leave dangling refs to deleted GlyphPageTreeNodes. + // Pruning will still occur via ~CSSSegmentedFontFace, when it's safe. +#if !PLATFORM(ANDROID) + pruneTable(); +#endif if (m_face) m_face->fontLoaded(this); } |