Get rid of TreeBoundaryCrossingRules.

Source/core/css/resolver/ScopedStyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 28 matching lines @@
 #include "core/css/resolver/ViewportStyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/StyleEngine.h"
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/html/HTMLStyleElement.h"
 #include "core/svg/SVGStyleElement.h"
 
 namespace blink {
 
+ScopedStyleResolver::~ScopedStyleResolver()
+{
+    if (m_treeBoundaryCrossingRuleSet)
+        treeScope().document().styleEngine().removeTreeBoundaryCrossingScope();
+}
+
 TreeScope* ScopedStyleResolver::treeScopeFor(Document& document, const CSSStyleSheet* sheet)
 {
     ASSERT(sheet);
 
     if (!sheet->ownerDocument())
         return 0;
 
     Node* ownerNode = sheet->ownerNode();
     if (!isHTMLStyleElement(ownerNode) && !isSVGStyleElement(ownerNode))
         return &document;
@@ skipping 65 matching lines @@
 
     for (const auto& rules : *m_treeBoundaryCrossingRuleSet)
         features.add(rules->m_ruleSet->features());
 }
 
 void ScopedStyleResolver::resetAuthorStyle()
 {
     m_authorStyleSheets.clear();
     m_keyframesRuleMap.clear();
     m_treeBoundaryCrossingRuleSet = nullptr;
+    treeScope().document().styleEngine().removeTreeBoundaryCrossingScope();
 }
 
 StyleRuleKeyframes* ScopedStyleResolver::keyframeStylesForAnimation(const StringImpl* animationName)
 {
     if (m_keyframesRuleMap.isEmpty())
         return nullptr;
 
     KeyframesRuleMap::iterator it = m_keyframesRuleMap.find(animationName);
     if (it == m_keyframesRuleMap.end())
         return nullptr;
 
     return it->value.get();
 }
 
 void ScopedStyleResolver::addKeyframeStyle(PassRefPtrWillBeRawPtr<StyleRuleKeyframes> rule)
 {
     AtomicString s(rule->name());
 
     if (rule->isVendorPrefixed()) {
         KeyframesRuleMap::iterator it = m_keyframesRuleMap.find(s.impl());
         if (it == m_keyframesRuleMap.end())
             m_keyframesRuleMap.set(s.impl(), rule);
         else if (it->value->isVendorPrefixed())
             m_keyframesRuleMap.set(s.impl(), rule);
     } else {
         m_keyframesRuleMap.set(s.impl(), rule);
     }
 }
 
-void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& collector, bool includeEmptyRules, CascadeOrder cascadeOrder)
+void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& collector, bool includeEmptyRules)
 {
     ASSERT(!collector.scopeContainsLastMatchedElement());
     collector.setScopeContainsLastMatchedElement(true);
     for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) {
         ASSERT(m_authorStyleSheets[i]->ownerNode());
         MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet(), includeEmptyRules, &m_scope->rootNode(), m_authorStyleSheets[i], i);
-        collector.collectMatchingRules(matchRequest, cascadeOrder);
+        collector.collectMatchingRules(matchRequest);
     }
     collector.setScopeContainsLastMatchedElement(false);
 }
 
-void ScopedStyleResolver::collectMatchingShadowHostRules(ElementRuleCollector& collector, bool includeEmptyRules, CascadeOrder cascadeOrder)
+void ScopedStyleResolver::collectMatchingShadowHostRules(ElementRuleCollector& collector, bool includeEmptyRules)
 {
     ASSERT(!collector.scopeContainsLastMatchedElement());
     collector.setScopeContainsLastMatchedElement(true);
     for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) {
         ASSERT(m_authorStyleSheets[i]->ownerNode());
         MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet(), includeEmptyRules, &m_scope->rootNode(), m_authorStyleSheets[i], i);
-        collector.collectMatchingShadowHostRules(matchRequest, cascadeOrder);
+        collector.collectMatchingShadowHostRules(matchRequest);
     }
     collector.setScopeContainsLastMatchedElement(false);
 }
 
-void ScopedStyleResolver::collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector& collector, bool includeEmptyRules, CascadeOrder cascadeOrder)
+void ScopedStyleResolver::collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector& collector, bool includeEmptyRules)
 {
+    if (!m_treeBoundaryCrossingRuleSet)
+        return;
+
+    ASSERT(!collector.scopeContainsLastMatchedElement());
+    collector.setScopeContainsLastMatchedElement(true);
+
     for (const auto& rules : *m_treeBoundaryCrossingRuleSet) {
         MatchRequest request(rules->m_ruleSet.get(), includeEmptyRules, &treeScope().rootNode(), rules->m_parentStyleSheet, rules->m_parentIndex);
-        collector.collectMatchingRules(request, cascadeOrder, true);
+        collector.collectMatchingRules(request, true);
     }
+
+    collector.setScopeContainsLastMatchedElement(false);
 }
 
 void ScopedStyleResolver::matchPageRules(PageRuleCollector& collector)
 {
     // Only consider the global author RuleSet for @page rules, as per the HTML5 spec.
     ASSERT(m_scope->rootNode().isDocumentNode());
     for (size_t i = 0; i < m_authorStyleSheets.size(); ++i)
         collector.matchPageRules(&m_authorStyleSheets[i]->contents()->ruleSet());
 }
 
@@ skipping 30 matching lines @@
         return;
 
     OwnPtrWillBeRawPtr<RuleSet> ruleSetForScope = RuleSet::create();
     addRules(ruleSetForScope.get(), authorRules.treeBoundaryCrossingRules());
 
     if (!isDocumentScope)
         addRules(ruleSetForScope.get(), authorRules.shadowDistributedRules());
 
     if (!m_treeBoundaryCrossingRuleSet) {
         m_treeBoundaryCrossingRuleSet = adoptPtrWillBeNoop(new CSSStyleSheetRuleSubSet());
-        treeScope().document().styleResolver()->addTreeBoundaryCrossingScope(treeScope().rootNode());
+        treeScope().document().styleEngine().addTreeBoundaryCrossingScope();
     }
 
     m_treeBoundaryCrossingRuleSet->append(RuleSubSet::create(parentStyleSheet, sheetIndex, ruleSetForScope.release()));
 }
 
 DEFINE_TRACE(ScopedStyleResolver::RuleSubSet)
 {
     visitor->trace(m_ruleSet);
 }
 
 } // namespace blink