Moving fontSelector from StyleResolver to StyleEngine.

Source/core/dom/StyleEngine.cpp

Index: Source/core/dom/StyleEngine.cpp
diff --git a/Source/core/dom/StyleEngine.cpp b/Source/core/dom/StyleEngine.cpp
index 034ef447739fe267419bc4ac5f3e885ef3743f28..ffbd143f884533d50da82ae878cddbd524ed2783 100644
--- a/Source/core/dom/StyleEngine.cpp
+++ b/Source/core/dom/StyleEngine.cpp
@@ -30,6 +30,7 @@
 
 #include "HTMLNames.h"
 #include "SVGNames.h"
+#include "core/css/CSSFontSelector.h"
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/StyleInvalidationAnalysis.h"
 #include "core/css/StyleSheetContents.h"
@@ -68,11 +69,16 @@ StyleEngine::StyleEngine(Document& document)
     , m_didCalculateResolver(false)
     , m_lastResolverAccessCount(0)
     , m_resolverThrowawayTimer(this, &StyleEngine::resolverThrowawayTimerFired)
+    , m_fontSelector(CSSFontSelector::create(&document))
 {
 }
 
 StyleEngine::~StyleEngine()
 {
+    if (m_resolver)
+        m_fontSelector->unregisterForInvalidationCallbacks(m_resolver.get());
+    m_fontSelector->clearDocument();
+
     for (unsigned i = 0; i < m_injectedAuthorStyleSheets.size(); ++i)
         m_injectedAuthorStyleSheets[i]->clearOwnerNode();
     for (unsigned i = 0; i < m_authorStyleSheets.size(); ++i)
@@ -404,11 +410,14 @@ void StyleEngine::createResolver()
     ASSERT(m_document.frame());
 
     m_resolver = adoptPtr(new StyleResolver(m_document));
+    m_fontSelector->registerForInvalidationCallbacks(m_resolver.get());
     combineCSSFeatureFlags(m_resolver->ensureRuleFeatureSet());
 }
 
 void StyleEngine::clearResolver()
 {
+    if (m_resolver)
+        m_fontSelector->unregisterForInvalidationCallbacks(m_resolver.get());
     m_resolver.clear();
 }
 
@@ -424,11 +433,6 @@ void StyleEngine::resolverThrowawayTimerFired(Timer<StyleEngine>*)
     m_lastResolverAccessCount = resolverAccessCount();
 }
 
-CSSFontSelector* StyleEngine::fontSelector()
-{
-    return m_resolver ? m_resolver->fontSelector() : 0;
-}
-
 void StyleEngine::didAttach()
 {
     m_resolverThrowawayTimer.startRepeating(60);
@@ -466,4 +470,16 @@ StyleResolverChange StyleEngine::resolverChanged(StyleResolverUpdateMode mode)
     return change;
 }
 
+void StyleEngine::resetFontSelector()
+{
+    m_fontSelector->clearDocument();
+    if (m_resolver) {
+        m_fontSelector->unregisterForInvalidationCallbacks(m_resolver.get());

[dglazkov, 2013/12/02 17:47:42]

This is fishy, but we'll fix this in another patch.

[tasak, 2013/12/05 05:09:44]

Yeah, I will remove this method.

+        m_resolver->invalidateMatchedPropertiesCache();
+    }
+    m_fontSelector = CSSFontSelector::create(&m_document);
+    if (m_resolver)
+        m_fontSelector->registerForInvalidationCallbacks(m_resolver.get());
+}
+
 }