Remove global set of ScopedStyleResolvers.

sky/engine/core/dom/StyleEngine.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 15 matching lines @@
  */
 
 #include "sky/engine/config.h"
 #include "sky/engine/core/dom/StyleEngine.h"
 
 #include "sky/engine/core/css/CSSFontSelector.h"
 #include "sky/engine/core/css/CSSStyleSheet.h"
 #include "sky/engine/core/css/FontFaceCache.h"
 #include "sky/engine/core/css/StyleSheetContents.h"
 #include "sky/engine/core/dom/Element.h"
+#include "sky/engine/core/dom/ElementTraversal.h"
 #include "sky/engine/core/dom/StyleSheetCollection.h"
 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
 #include "sky/engine/core/frame/Settings.h"
 #include "sky/engine/core/html/HTMLStyleElement.h"
 #include "sky/engine/core/html/imports/HTMLImportsController.h"
 #include "sky/engine/core/page/Page.h"
 
 namespace blink {
 
 StyleEngine::StyleEngine(Document& document)
@@ skipping 20 matching lines @@
 
     if (m_fontSelector) {
         m_fontSelector->clearDocument();
         m_fontSelector->unregisterForInvalidationCallbacks(this);
     }
 
     // Decrement reference counts for things we could be keeping alive.
     m_fontSelector.clear();
     m_resolver.clear();
     m_styleSheetCollectionMap.clear();
-    for (ScopedStyleResolverSet::iterator it = m_scopedStyleResolvers.begin(); it != m_scopedStyleResolvers.end(); ++it)
-        const_cast<TreeScope&>((*it)->treeScope()).clearScopedStyleResolver();
-    m_scopedStyleResolvers.clear();
 }
 
 const Vector<RefPtr<CSSStyleSheet>>& StyleEngine::activeAuthorStyleSheetsFor(TreeScope& treeScope)
 {
     if (treeScope == m_document)
         return documentStyleSheetCollection()->activeAuthorStyleSheets();
     return ensureStyleSheetCollectionFor(treeScope)->activeAuthorStyleSheets();
 }
 
 StyleSheetCollection* StyleEngine::ensureStyleSheetCollectionFor(TreeScope& treeScope)
@@ skipping 82 matching lines @@
         if (!collection->hasStyleSheetCandidateNodes())
             treeScopesRemoved.add(treeScope);
     }
     m_activeTreeScopes.removeAll(treeScopesRemoved);
 
     m_dirtyTreeScopes.clear();
 }
 
 void StyleEngine::didRemoveShadowRoot(ShadowRoot* shadowRoot)
 {
-    if (shadowRoot->scopedStyleResolver())
-        removeScopedStyleResolver(shadowRoot->scopedStyleResolver());
     m_styleSheetCollectionMap.remove(shadowRoot);
 }
 
 void StyleEngine::appendActiveAuthorStyleSheets()
 {
     m_resolver->appendAuthorStyleSheets(documentStyleSheetCollection()->activeAuthorStyleSheets());
 
     TreeScopeSet::iterator begin = m_activeTreeScopes.begin();
     TreeScopeSet::iterator end = m_activeTreeScopes.end();
     for (TreeScopeSet::iterator it = begin; it != end; ++it) {
         if (StyleSheetCollection* collection = m_styleSheetCollectionMap.get(*it))
             m_resolver->appendAuthorStyleSheets(collection->activeAuthorStyleSheets());
     }
     m_resolver->finishAppendAuthorStyleSheets();
 }
 
 void StyleEngine::createResolver()
 {
     // It is a programming error to attempt to resolve style on a Document
     // which is not in a frame. Code which hits this should have checked
     // Document::isActive() before calling into code which could get here.
 
     ASSERT(m_document->frame());
 
     m_resolver = adoptPtr(new StyleResolver(*m_document));
-    addScopedStyleResolver(&m_document->ensureScopedStyleResolver());
 
     appendActiveAuthorStyleSheets();
 }
 
 void StyleEngine::clearResolver()
 {
     ASSERT(!m_document->inStyleRecalc());
-
-    for (ScopedStyleResolverSet::iterator it = m_scopedStyleResolvers.begin(); it != m_scopedStyleResolvers.end(); ++it)
-        const_cast<TreeScope&>((*it)->treeScope()).clearScopedStyleResolver();
-    m_scopedStyleResolvers.clear();
     m_resolver.clear();
 }
 
 unsigned StyleEngine::resolverAccessCount() const
 {
     return m_resolver ? m_resolver->accessCount() : 0;
 }
 
 void StyleEngine::didDetach()
 {
@@ skipping 80 matching lines @@
 void StyleEngine::removeSheet(StyleSheetContents* contents)
 {
     HashMap<RawPtr<StyleSheetContents>, AtomicString>::iterator it = m_sheetToTextCache.find(contents);
     if (it == m_sheetToTextCache.end())
         return;
 
     m_textToSheetCache.remove(it->value);
     m_sheetToTextCache.remove(contents);
 }
 
+// TODO(esprehn): This walks the entire document to collect features, instead
+// we should store features per scope and get rid of the global set.
+static void collectFeatures(TreeScope& scope, RuleFeatureSet& features, HashSet<const StyleSheetContents*> visitedSharedStyleSheetContents)
+{
+    scope.scopedStyleResolver().collectFeaturesTo(features, visitedSharedStyleSheetContents);
+    for (Element* element = ElementTraversal::firstWithin(scope.rootNode()); element; element = ElementTraversal::next(*element, &scope.rootNode())) {
+        if (ShadowRoot* root = element->shadowRoot())
+            collectFeatures(*root, features, visitedSharedStyleSheetContents);
+    }
+}
+
 void StyleEngine::collectScopedStyleFeaturesTo(RuleFeatureSet& features) const
 {
     HashSet<const StyleSheetContents*> visitedSharedStyleSheetContents;
-    for (ScopedStyleResolverSet::iterator it = m_scopedStyleResolvers.begin(); it != m_scopedStyleResolvers.end(); ++it)
-        (*it)->collectFeaturesTo(features, visitedSharedStyleSheetContents);
+    collectFeatures(*m_document, features, visitedSharedStyleSheetContents);
 }
 
 void StyleEngine::fontsNeedUpdate(CSSFontSelector*)
 {
     if (m_resolver)
         m_resolver->invalidateMatchedPropertiesCache();
     m_document->setNeedsStyleRecalc(SubtreeStyleChange);
 }
 
 }