Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1267)

Unified Diff: Source/core/svg/SVGFontFaceElement.cpp

Issue 198783006: Hold SVGFontFaceElement in SVGDocumentExtensions until StyleRecalc is finished (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed indent Created 6 years, 9 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
« no previous file with comments | « Source/core/svg/SVGFontData.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGFontFaceElement.cpp
diff --git a/Source/core/svg/SVGFontFaceElement.cpp b/Source/core/svg/SVGFontFaceElement.cpp
index 5430c487dadf2cf79be4c93abfa771b2034189b5..dbdec36fe5ce6819e00a2a95e32418234f06dc07 100644
--- a/Source/core/svg/SVGFontFaceElement.cpp
+++ b/Source/core/svg/SVGFontFaceElement.cpp
@@ -331,13 +331,15 @@ void SVGFontFaceElement::removedFrom(ContainerNode* rootParent)
if (rootParent->inDocument()) {
m_fontElement = 0;
document().accessSVGExtensions().unregisterSVGFontFaceElement(this);
+
// FIXME: HTMLTemplateElement's document or imported document can be active?
// If so, we also need to check whether fontSelector() is nullptr or not.
// Otherwise, we will use just document().isActive() here.
- if (document().isActive() && document().styleEngine()->fontSelector())
+ if (document().isActive() && document().styleEngine()->fontSelector()) {
document().styleEngine()->fontSelector()->fontFaceCache()->remove(m_fontFaceRule.get());
+ document().accessSVGExtensions().registerPendingSVGFontFaceElementsForRemoval(this);
+ }
m_fontFaceRule->mutableProperties().clear();
-
document().styleResolverChanged(RecalcStyleDeferred);
} else
ASSERT(!m_fontElement);
« no previous file with comments | « Source/core/svg/SVGFontData.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698