Renamed check for requiring ShadowPseudo combinator.

third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/parser/CSSSelectorParser.h"
 
 #include "core/css/CSSSelectorList.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/frame/UseCounter.h"
 #include "platform/RuntimeEnabledFeatures.h"
@@ skipping 545 matching lines @@
 
 const AtomicString& CSSSelectorParser::determineNamespace(const AtomicString& prefix)
 {
     if (!m_styleSheet)
         return defaultNamespace();
     return m_styleSheet->determineNamespace(prefix);
 }
 
 void CSSSelectorParser::prependTypeSelectorIfNeeded(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSParserSelector* compoundSelector)
 {
-    if (elementName.isNull() && defaultNamespace() == starAtom && !compoundSelector->crossesTreeScopes())
+    if (elementName.isNull() && defaultNamespace() == starAtom && !compoundSelector->needsImplicitShadowCrossingCombinatorForMatching())
         return;
 
     AtomicString determinedElementName = elementName.isNull() ? starAtom : elementName;
     AtomicString namespaceURI = determineNamespace(namespacePrefix);
     if (namespaceURI.isNull())
         return;
     QualifiedName tag = QualifiedName(namespacePrefix, determinedElementName, namespaceURI);
 
-    if (compoundSelector->crossesTreeScopes())
+    if (compoundSelector->needsImplicitShadowCrossingCombinatorForMatching())
         return rewriteSpecifiersWithElementNameForCustomPseudoElement(tag, compoundSelector, elementName.isNull());
 
     if (compoundSelector->pseudoType() == CSSSelector::PseudoContent)
         return rewriteSpecifiersWithElementNameForContentPseudoElement(tag, compoundSelector, elementName.isNull());
 
     // *:host never matches, so we can't discard the * otherwise we can't tell the
     // difference between *:host and just :host.
     if (tag == anyQName() && !compoundSelector->hasHostPseudoSelector())
         return;
     compoundSelector->prependTagSelector(tag, elementName.isNull());
 }
 
 void CSSSelectorParser::rewriteSpecifiersWithElementNameForCustomPseudoElement(const QualifiedName& tag, CSSParserSelector* specifiers, bool tagIsImplicit)
 {
     CSSParserSelector* lastShadowPseudo = specifiers;
     CSSParserSelector* history = specifiers;
     while (history->tagHistory()) {
         history = history->tagHistory();
-        if (history->crossesTreeScopes() || history->hasShadowPseudo())
+        if (history->needsImplicitShadowCrossingCombinatorForMatching()
+            || history->hasImplicitShadowCrossingCombinatorForMatching()) {
             lastShadowPseudo = history;
+        }
     }
 
     if (lastShadowPseudo->tagHistory()) {
+        ASSERT(lastShadowPseudo->hasImplicitShadowCrossingCombinatorForMatching());
         if (tag != anyQName())
             lastShadowPseudo->tagHistory()->prependTagSelector(tag, tagIsImplicit);
         return;
     }
 
     // For shadow-ID pseudo-elements to be correctly matched, the ShadowPseudo combinator has to be used.
     // We therefore create a new Selector with that combinator here in any case, even if matching any (host) element in any namespace (i.e. '*').
     OwnPtr<CSSParserSelector> elementNameSelector = CSSParserSelector::create(tag);
     lastShadowPseudo->setTagHistory(elementNameSelector.release());
     lastShadowPseudo->setRelation(CSSSelector::ShadowPseudo);
@@ skipping 46 matching lines @@
     // TODO(rune@opera.com): We should try to remove the need for the re-ordering tricks
     // below and in the remaining rewrite* methods by using a more suitable storage
     // structure in CSSSelectorParser.
     //
     // The code below is to keep ::content at the end of the compound, and to keep the
     // tagHistory order correct for implicit ShadowPseudo and juggling multiple (two?)
     // compounds.
 
     CSSSelector::Relation relation = CSSSelector::SubSelector;
 
-    if (simpleSelector->crossesTreeScopes() || simpleSelector->pseudoType() == CSSSelector::PseudoContent) {
-        if (simpleSelector->crossesTreeScopes())
+    if (simpleSelector->needsImplicitShadowCrossingCombinatorForMatching() || simpleSelector->pseudoType() == CSSSelector::PseudoContent) {
+        if (simpleSelector->needsImplicitShadowCrossingCombinatorForMatching())
             relation = CSSSelector::ShadowPseudo;
         simpleSelector->appendTagHistory(relation, compoundSelector);
         return simpleSelector;
     }
-    if (compoundSelector->crossesTreeScopes() || compoundSelector->pseudoType() == CSSSelector::PseudoContent) {
-        if (compoundSelector->crossesTreeScopes())
+    if (compoundSelector->needsImplicitShadowCrossingCombinatorForMatching() || compoundSelector->pseudoType() == CSSSelector::PseudoContent) {
+        if (compoundSelector->needsImplicitShadowCrossingCombinatorForMatching())
             relation = CSSSelector::ShadowPseudo;
         compoundSelector->insertTagHistory(CSSSelector::SubSelector, simpleSelector, relation);
         return compoundSelector;
     }
 
     // All other simple selectors are added to the end of the compound.
     compoundSelector->appendTagHistory(CSSSelector::SubSelector, simpleSelector);
     return compoundSelector;
 }
 
 } // namespace blink