Don't scope check in SelectorChecker.

sky/engine/core/css/ElementRuleCollector.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 25 matching lines @@
 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
 #include "sky/engine/core/rendering/style/RenderStyle.h"
 #include "sky/engine/core/rendering/style/StyleInheritedData.h"
 
 namespace blink {
 
 ElementRuleCollector::ElementRuleCollector(const ElementResolveContext& context,
     RenderStyle* style)
     : m_context(context)
     , m_style(style)
-    , m_matchingUARules(false)
 { }
 
 ElementRuleCollector::~ElementRuleCollector()
 {
 }
 
 MatchResult& ElementRuleCollector::matchedResult()
 {
     return m_result;
 }
@@ skipping 17 matching lines @@
     if (!propertySet)
         return;
     m_result.ranges.lastAuthorRule = m_result.matchedProperties.size();
     if (m_result.ranges.firstAuthorRule == -1)
         m_result.ranges.firstAuthorRule = m_result.ranges.lastAuthorRule;
     m_result.addMatchedProperties(propertySet);
     if (!isCacheable)
         m_result.isCacheable = false;
 }
 
-static bool rulesApplicableInCurrentTreeScope(const Element* element, const ContainerNode* scopingNode)
-{
-    TreeScope& treeScope = element->treeScope();
-    return !scopingNode ||
-        treeScope == scopingNode->treeScope() ||
-        SelectorChecker::isHostInItsShadowTree(*element, scopingNode);
-}
-
 void ElementRuleCollector::collectMatchingRules(const MatchRequest& matchRequest, RuleRange& ruleRange, CascadeOrder cascadeOrder)
 {
     ASSERT(matchRequest.ruleSet);
     ASSERT(m_context.element());
 
     Element& element = *m_context.element();
 
-    if (!m_matchingUARules && !rulesApplicableInCurrentTreeScope(&element, matchRequest.scope))
-        return;
-
     // We need to collect the rules for id, class, tag, and everything else into a buffer and
     // then sort the buffer.
     if (element.hasID())
         collectMatchingRulesForList(matchRequest.ruleSet->idRules(element.idForStyleResolution()), cascadeOrder, matchRequest, ruleRange);
     if (element.isStyledElement() && element.hasClass()) {
         for (size_t i = 0; i < element.classNames().size(); ++i)
             collectMatchingRulesForList(matchRequest.ruleSet->classRules(element.classNames()[i]), cascadeOrder, matchRequest, ruleRange);
     }
 
     collectMatchingRulesForList(matchRequest.ruleSet->tagRules(element.localName()), cascadeOrder, matchRequest, ruleRange);
     collectMatchingRulesForList(matchRequest.ruleSet->universalRules(), cascadeOrder, matchRequest, ruleRange);
 }
 
+void ElementRuleCollector::collectMatchingHostRules(const MatchRequest& matchRequest, RuleRange& ruleRange, CascadeOrder cascadeOrder)
+{
+    collectMatchingRulesForList(matchRequest.ruleSet->hostRules(), cascadeOrder, matchRequest, ruleRange);
+}
+
 void ElementRuleCollector::sortAndTransferMatchedRules()
 {
     if (!m_matchedRules || m_matchedRules->isEmpty())
         return;
 
     sortMatchedRules();
 
     Vector<MatchedRule, 32>& matchedRules = *m_matchedRules;
 
     // Now transfer the set of matched rules over to our list of declarations.
     for (unsigned i = 0; i < matchedRules.size(); i++) {
         const RuleData* ruleData = matchedRules[i].ruleData();
         m_result.addMatchedProperties(&ruleData->rule()->properties());
     }
 }
 
-inline bool ElementRuleCollector::ruleMatches(const RuleData& ruleData, const ContainerNode* scope)
+inline bool ElementRuleCollector::ruleMatches(const RuleData& ruleData)
 {
     SelectorChecker checker(*m_context.element());
-    if (checker.match(ruleData.selector(), scope)) {
+    if (checker.match(ruleData.selector())) {
         if (checker.matchedAttributeSelector())
             m_style->setUnique();
         if (checker.matchedFocusSelector())
             m_style->setAffectedByFocus();
         if (checker.matchedHoverSelector())
             m_style->setAffectedByHover();
         if (checker.matchedActiveSelector())
             m_style->setAffectedByActive();
         return true;
     }
     return false;
 }
 
 void ElementRuleCollector::collectRuleIfMatches(const RuleData& ruleData, CascadeOrder cascadeOrder, const MatchRequest& matchRequest, RuleRange& ruleRange)
 {
     StyleRule* rule = ruleData.rule();
-    if (ruleMatches(ruleData, matchRequest.scope)) {
+    if (ruleMatches(ruleData)) {
         // If the rule has no properties to apply, then ignore it in the non-debug mode.
         const StylePropertySet& properties = rule->properties();
         if (properties.isEmpty())
             return;
 
         // Update our first/last rule indices in the matched rules array.
         ++ruleRange.lastRuleIndex;
         if (ruleRange.firstRuleIndex == -1)
             ruleRange.firstRuleIndex = ruleRange.lastRuleIndex;
 
         // Add this rule to our list of matched rules.
         addMatchedRule(&ruleData, cascadeOrder, matchRequest.styleSheetIndex, matchRequest.styleSheet);
     }
 }
 
 static inline bool compareRules(const MatchedRule& matchedRule1, const MatchedRule& matchedRule2)
 {
     return matchedRule1.position() < matchedRule2.position();
 }
 
 void ElementRuleCollector::sortMatchedRules()
 {
     ASSERT(m_matchedRules);
     std::sort(m_matchedRules->begin(), m_matchedRules->end(), compareRules);
 }
 
 } // namespace blink