diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-03-14 16:05:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-14 16:05:47 -0700 |
| commit | a0fb3c7e0c38540c392a5248b0f1100c158612f9 (patch) | |
| tree | 1f5a7763a6cd6efcd062ed1468ff1bbb1fc557b3 /WebCore/css | |
| parent | 9bddcae7719c7fd62778a3cf1a63b1fdceb8e25a (diff) | |
| parent | 366835cb6750a97a5e29e0abcc6e3e6705411a72 (diff) | |
| download | external_webkit-a0fb3c7e0c38540c392a5248b0f1100c158612f9.zip external_webkit-a0fb3c7e0c38540c392a5248b0f1100c158612f9.tar.gz external_webkit-a0fb3c7e0c38540c392a5248b0f1100c158612f9.tar.bz2 | |
Merge "Custom font was appearing all white in Books" into honeycomb-mr1
Diffstat (limited to 'WebCore/css')
| -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) |