Move TreeBoundaryCrossingScopes to StyleEngine.

third_party/WebKit/Source/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.
@@ skipping 363 matching lines @@
 }
 
 void StyleEngine::didRemoveShadowRoot(ShadowRoot* shadowRoot) {
   m_styleSheetCollectionMap.remove(shadowRoot);
   m_activeTreeScopes.remove(shadowRoot);
   m_dirtyTreeScopes.remove(shadowRoot);
 }
 
 void StyleEngine::shadowRootRemovedFromDocument(ShadowRoot* shadowRoot) {
   if (StyleResolver* styleResolver = resolver()) {
-    styleResolver->resetAuthorStyle(*shadowRoot);
+    styleResolver->resetRuleFeatures();
 
     if (TreeScopeStyleSheetCollection* collection =
             styleSheetCollectionFor(*shadowRoot))
       styleResolver->removePendingAuthorStyleSheets(
           collection->activeAuthorStyleSheets());
   }
+  shadowRoot->clearScopedStyleResolver();
   m_styleSheetCollectionMap.remove(shadowRoot);
   m_activeTreeScopes.remove(shadowRoot);
   m_dirtyTreeScopes.remove(shadowRoot);
+  m_treeBoundaryCrossingScopes.remove(&shadowRoot->rootNode());
+}
+
+void StyleEngine::addTreeBoundaryCrossingScope(const TreeScope& treeScope) {
+  m_treeBoundaryCrossingScopes.add(&treeScope.rootNode());
+}
+
+void StyleEngine::resetAuthorStyle(TreeScope& treeScope) {
+  m_treeBoundaryCrossingScopes.remove(&treeScope.rootNode());
+
+  ScopedStyleResolver* scopedResolver = treeScope.scopedStyleResolver();
+  if (!scopedResolver)
+    return;
+
+  DCHECK(m_resolver);
+  m_resolver->resetRuleFeatures();
+  if (treeScope.rootNode().isDocumentNode()) {
+    scopedResolver->resetAuthorStyle();
+    return;
+  }
+
+  treeScope.clearScopedStyleResolver();
 }
 
 void StyleEngine::appendActiveAuthorStyleSheets() {
   DCHECK(isMaster());
 
   viewportRulesChanged();
 
   m_resolver->appendAuthorStyleSheets(
       documentStyleSheetCollection().activeAuthorStyleSheets());
   for (TreeScope* treeScope : m_activeTreeScopes) {
@@ skipping 576 matching lines @@
   visitor->trace(m_document);
   visitor->trace(m_injectedAuthorStyleSheets);
   visitor->trace(m_inspectorStyleSheet);
   visitor->trace(m_documentStyleSheetCollection);
   visitor->trace(m_styleSheetCollectionMap);
   visitor->trace(m_resolver);
   visitor->trace(m_viewportResolver);
   visitor->trace(m_styleInvalidator);
   visitor->trace(m_dirtyTreeScopes);
   visitor->trace(m_activeTreeScopes);
+  visitor->trace(m_treeBoundaryCrossingScopes);
   visitor->trace(m_fontSelector);
   visitor->trace(m_textToSheetCache);
   visitor->trace(m_sheetToTextCache);
   CSSFontSelectorClient::trace(visitor);
 }
 
 DEFINE_TRACE_WRAPPERS(StyleEngine) {
   for (auto sheet : m_injectedAuthorStyleSheets) {
     visitor->traceWrappers(sheet);
   }
   visitor->traceWrappers(m_documentStyleSheetCollection);
 }
 
 }  // namespace blink