diff options
author | Victoria Lease <violets@google.com> | 2012-04-30 16:30:16 -0700 |
---|---|---|
committer | Victoria Lease <violets@google.com> | 2012-05-04 10:03:46 -0700 |
commit | 148e59acccda9790f6db649b46652f92fa042715 (patch) | |
tree | c49ae712e194ca5719340983101ffb3371f9d2d9 /Source/WebCore/css/CSSFontSelector.cpp | |
parent | 940c47782e72ed37ba9f1193af1265a56a3df7e1 (diff) | |
download | external_webkit-148e59acccda9790f6db649b46652f92fa042715.zip external_webkit-148e59acccda9790f6db649b46652f92fa042715.tar.gz external_webkit-148e59acccda9790f6db649b46652f92fa042715.tar.bz2 |
Cherrypick WebKit r94508.
http://trac.webkit.org/changeset/94508
This, in conjunction with WebKit r95959, addresses our issue involving
referencing deleted fonts.
Bug: 6105670
Change-Id: Ica4c89046ed47e2c75d13640a27ac92f2aad6709
Diffstat (limited to 'Source/WebCore/css/CSSFontSelector.cpp')
-rw-r--r-- | Source/WebCore/css/CSSFontSelector.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebCore/css/CSSFontSelector.cpp b/Source/WebCore/css/CSSFontSelector.cpp index 8024afa..0f70664 100644 --- a/Source/WebCore/css/CSSFontSelector.cpp +++ b/Source/WebCore/css/CSSFontSelector.cpp @@ -378,6 +378,16 @@ void CSSFontSelector::fontCacheInvalidated() dispatchInvalidationCallbacks(); } +void CSSFontSelector::retireCustomFont(FontData* fontData) +{ + if (m_document) + m_document->retireCustomFont(fontData); + else { + GlyphPageTreeNode::pruneTreeCustomFontData(fontData); + delete fontData; + } +} + static FontData* fontDataForGenericFamily(Document* document, const FontDescription& fontDescription, const AtomicString& familyName) { if (!document || !document->frame()) |