diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-03-07 10:53:57 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-07 10:53:57 -0800 |
| commit | f61e9d35316897cadf1f8969a368da73f826ac02 (patch) | |
| tree | 9872d0c67929f84d7aa74b52db7e405339cd2e10 /WebCore/css/CSSFontFaceSource.cpp | |
| parent | 9e143ba2bd15b3dd507999ba142269ab17df938a (diff) | |
| parent | 26293c75113cb08e4392ef98da92d6fb1c65b40c (diff) | |
| download | external_webkit-f61e9d35316897cadf1f8969a368da73f826ac02.zip external_webkit-f61e9d35316897cadf1f8969a368da73f826ac02.tar.gz external_webkit-f61e9d35316897cadf1f8969a368da73f826ac02.tar.bz2 | |
Merge "Fixed 3469204: Crash using downloaded fonts" into honeycomb-mr1
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); } |