Source/WebCore/css/CSSFontSelector.cpp - Issue 7932007: Merge 94508 - <rdar://problem/10071256> Retain retired custom fonts until the next style recalc

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/css/CSSFontSelector.cpp

Issue 7932007: Merge 94508 - <rdar://problem/10071256> Retain retired custom fonts until the next style recalc (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Source/WebCore/css/CSSFontSelector.cpp

===================================================================

--- Source/WebCore/css/CSSFontSelector.cpp (revision 95343)

+++ Source/WebCore/css/CSSFontSelector.cpp (working copy)

@@ -379,6 +379,16 @@

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())

« no previous file with comments | « Source/WebCore/css/CSSFontSelector.h ('k') | Source/WebCore/css/CSSSegmentedFontFace.cpp » ('j') | no next file with comments »