diff options
| -rw-r--r-- | WebCore/css/CSSFontFaceSource.cpp | 7 | ||||
| -rw-r--r-- | WebCore/css/CSSSegmentedFontFace.cpp | 7 |
2 files changed, 12 insertions, 2 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); } diff --git a/WebCore/css/CSSSegmentedFontFace.cpp b/WebCore/css/CSSSegmentedFontFace.cpp index cdabec1..51f2d42 100644 --- a/WebCore/css/CSSSegmentedFontFace.cpp +++ b/WebCore/css/CSSSegmentedFontFace.cpp @@ -72,7 +72,12 @@ bool CSSSegmentedFontFace::isValid() const void CSSSegmentedFontFace::fontLoaded(CSSFontFace*) { - 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 } void CSSSegmentedFontFace::appendFontFace(PassRefPtr<CSSFontFace> fontFace) |