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