Get rid of Reset and ResetStyleResolverAndFontSelector.

Source/core/dom/DocumentStyleSheetCollection.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, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
@@ skipping 34 matching lines @@
 namespace WebCore {
 
 using namespace HTMLNames;
 
 DocumentStyleSheetCollection::DocumentStyleSheetCollection(TreeScope& treeScope)
     : StyleSheetCollection(treeScope)
 {
     ASSERT(treeScope.rootNode() == treeScope.rootNode()->document());
 }
 
+static void collectActiveCSSStyleSheetsFromSeamlessParents(StyleSheetCollectionBase& collection, Document* document)
+{
+    HTMLIFrameElement* seamlessParentIFrame = document->seamlessParentIFrame();
+    if (!seamlessParentIFrame)
+        return;
+    collection.appendActiveStyleSheets(seamlessParentIFrame->document().styleEngine()->activeAuthorStyleSheets());
+}
+
 void DocumentStyleSheetCollection::collectStyleSheets(StyleEngine* engine, StyleSheetCollectionBase& collection)
 {
+    collection.appendActiveStyleSheets(engine->injectedAuthorStyleSheets());
+    collection.appendActiveStyleSheets(engine->documentAuthorStyleSheets());
+    collectActiveCSSStyleSheetsFromSeamlessParents(collection, document());
+
     DocumentOrderedList::iterator begin = m_styleSheetCandidateNodes.begin();
     DocumentOrderedList::iterator end = m_styleSheetCandidateNodes.end();
     for (DocumentOrderedList::iterator it = begin; it != end; ++it) {
         Node* n = *it;
         StyleSheet* sheet = 0;
         CSSStyleSheet* activeSheet = 0;
         if (n->nodeType() == Node::PROCESSING_INSTRUCTION_NODE && !document()->isHTMLDocument()) {
             // Processing instruction (XML documents only).
             // We don't support linking to embedded CSS stylesheets, see <https://bugs.webkit.org/show_bug.cgi?id=49281> for discussion.
             ProcessingInstruction* pi = toProcessingInstruction(n);
@@ skipping 63 matching lines @@
                 activeSheet = 0;
         }
 
         if (sheet)
             collection.appendSheetForList(sheet);
         if (activeSheet)
             collection.appendActiveStyleSheet(activeSheet);
     }
 }
 
-static void collectActiveCSSStyleSheetsFromSeamlessParents(StyleSheetCollectionBase& collection, Document* document)
-{
-    HTMLIFrameElement* seamlessParentIFrame = document->seamlessParentIFrame();
-    if (!seamlessParentIFrame)
-        return;
-    collection.appendActiveStyleSheets(seamlessParentIFrame->document().styleEngine()->activeAuthorStyleSheets());
 }
-
-bool DocumentStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine, StyleResolverUpdateMode updateMode)
-{
-    StyleSheetCollectionBase collection;
-    collection.appendActiveStyleSheets(engine->injectedAuthorStyleSheets());
-    collection.appendActiveStyleSheets(engine->documentAuthorStyleSheets());
-    collectActiveCSSStyleSheetsFromSeamlessParents(collection, document());
-    collectStyleSheets(engine, collection);
-
-    StyleSheetChange change;
-    analyzeStyleSheetChange(updateMode, collection, change);
-
-    if (change.styleResolverUpdateType == Reconstruct) {
-        engine->clearResolver();
-    } else if (StyleResolver* styleResolver = engine->resolverIfExists()) {
-        // FIXME: We might have already had styles in child treescope. In this case, we cannot use buildScopedStyleTreeInDocumentOrder.
-        // Need to change "false" to some valid condition.
-        styleResolver->setBuildScopedStyleTreeInDocumentOrder(false);
-        if (change.styleResolverUpdateType != Additive) {
-            ASSERT(change.styleResolverUpdateType == Reset || change.styleResolverUpdateType == ResetStyleResolverAndFontSelector);
-            resetAllRuleSetsInTreeScope(styleResolver);
-            if (change.styleResolverUpdateType == ResetStyleResolverAndFontSelector)
-                styleResolver->resetFontSelector();
-            styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleSheets);
-            styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAuthorStyleSheets());
-        } else {
-            styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets.size(), collection.activeAuthorStyleSheets());
-        }
-    }
-    m_scopingNodesForStyleScoped.didRemoveScopingNodes();
-    collection.swap(*this);
-    updateUsesRemUnits();
-
-    return change.requiresFullStyleRecalc;
-}
-
-}