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

Unified Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 82583005: Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index 919cf9c2ef751be31dd55101c5c66592e3e451f5..a740381f1886289be5c2f6f800455ac0564c7341 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -291,15 +291,12 @@ void StyleResolver::processScopedRules(const RuleSet& authorRules, const KURL& s
}
}
-void StyleResolver::resetFontSelector()
+void StyleResolver::removeFontFaceRule(Vector<const StyleRuleFontFace*>& removedFontFace)
dglazkov 2013/11/25 16:27:29 removeFontFaceRules? Could the argument be const?
tasak 2013/11/26 07:49:06 Done.
{
ASSERT(m_fontSelector);
- m_fontSelector->unregisterForInvalidationCallbacks(this);
- m_fontSelector->clearDocument();
+ for (unsigned i = 0; i < removedFontFace.size(); ++i)
+ m_fontSelector->removeFontFaceRule(removedFontFace[i]);
invalidateMatchedPropertiesCache();
-
- m_fontSelector = CSSFontSelector::create(&m_document);
- m_fontSelector->registerForInvalidationCallbacks(this);
}
void StyleResolver::resetAuthorStyle(const ContainerNode* scopingNode)

Powered by Google App Engine
This is Rietveld 408576698