Simplify tree scope tracking in StyleEngine.

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 31 matching lines @@
 #include "sky/engine/core/html/imports/HTMLImportsController.h"
 #include "sky/engine/core/page/Page.h"
 
 namespace blink {
 
 StyleEngine::StyleEngine(Document& document)
     : m_document(&document)
     , m_fontSelector(CSSFontSelector::create(&document))
 {
     m_fontSelector->registerForInvalidationCallbacks(this);
+    m_activeTreeScopes.add(&document);
 }
 
 StyleEngine::~StyleEngine()
 {
     m_fontSelector->clearDocument();
     m_fontSelector->unregisterForInvalidationCallbacks(this);
 }
 
-void StyleEngine::addStyleSheetCandidateNode(Node* node, bool createdByParser)
+void StyleEngine::addTreeScope(TreeScope& scope)
 {
-    if (!node->inDocument())
-        return;
-
-    TreeScope& treeScope = isHTMLStyleElement(*node) ? node->treeScope() : *m_document;
-    ASSERT(isHTMLStyleElement(node) || treeScope == m_document);
-    StyleSheetCollection& collection = treeScope.styleSheets();
-    collection.addStyleSheetCandidateNode(node, createdByParser);
-
-    if (treeScope != m_document)
-        m_activeTreeScopes.add(&treeScope);
+    m_activeTreeScopes.add(&scope);
 }
 
-void StyleEngine::removeStyleSheetCandidateNode(Node* node, ContainerNode* scopingNode, TreeScope& treeScope)
+void StyleEngine::removeTreeScope(TreeScope& scope)
 {
-    ASSERT(isHTMLStyleElement(node) || treeScope == m_document);
-
-    StyleSheetCollection& collection = treeScope.styleSheets();
-    collection.removeStyleSheetCandidateNode(node, scopingNode);
-
-    m_activeTreeScopes.remove(&treeScope);
+    m_activeTreeScopes.remove(&scope);
 }
 
 void StyleEngine::updateActiveStyleSheets()
 {
     ASSERT(!m_document->inStyleRecalc());
 
     if (!m_document->isActive())
         return;
 
-    // TODO(esprehn): Remove special case for document.
-    m_document->styleSheets().updateActiveStyleSheets(this);
-
-    TreeScopeSet treeScopes = m_activeTreeScopes;
-    HashSet<TreeScope*> treeScopesRemoved;
-
-    for (TreeScopeSet::iterator it = treeScopes.begin(); it != treeScopes.end(); ++it) {
-        TreeScope* treeScope = *it;
-        ASSERT(treeScope != m_document);
-        StyleSheetCollection& collection = treeScope->styleSheets();
-        collection.updateActiveStyleSheets(this);
-        if (!collection.hasStyleSheetCandidateNodes())
-            treeScopesRemoved.add(treeScope);
-    }
-    m_activeTreeScopes.removeAll(treeScopesRemoved);
+    for (TreeScope* treeScope : m_activeTreeScopes)
+        treeScope->styleSheets().updateActiveStyleSheets(this);
 }
 
 void StyleEngine::appendActiveAuthorStyleSheets()
 {
-    // TODO(esprehn): Remove special case for document.
-    m_resolver->appendAuthorStyleSheets(m_document->styleSheets().activeAuthorStyleSheets());
-
     for (TreeScope* treeScope : m_activeTreeScopes)
         m_resolver->appendAuthorStyleSheets(treeScope->styleSheets().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
@@ skipping 81 matching lines @@
 }
 
 void StyleEngine::fontsNeedUpdate(CSSFontSelector*)
 {
     if (m_resolver)
         m_resolver->invalidateMatchedPropertiesCache();
     m_document->setNeedsStyleRecalc(SubtreeStyleChange);
 }
 
 }