Use correct cascading order for Shadow DOM v1

third_party/WebKit/Source/core/css/ElementRuleCollector.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 21 matching lines @@
 
 namespace blink {
 
 class CSSStyleSheet;
 class CSSRuleList;
 class RuleData;
 class RuleSet;
 class SelectorFilter;
 class StaticCSSRuleList;
 
+// TODO(kochi): CascadeOrder is used only for Shadow DOM V0 bug-compatible cascading order.
+//              Once Shadow DOM V0 implementation is gone, remove this completely.
 using CascadeOrder = unsigned;
-
 const CascadeOrder ignoreCascadeOrder = 0;
 
 class MatchedRule {
     DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     MatchedRule(const RuleData* ruleData, unsigned specificity, CascadeOrder cascadeOrder, unsigned styleSheetIndex, const CSSStyleSheet* parentStyleSheet)
         : m_ruleData(ruleData)
         , m_specificity(specificity)
         , m_parentStyleSheet(parentStyleSheet)
     {
         ASSERT(m_ruleData);
         static const unsigned BitsForPositionInRuleData = 18;
         static const unsigned BitsForStyleSheetIndex = 32;
-        m_position = ((uint64_t)cascadeOrder << (BitsForStyleSheetIndex + BitsForPositionInRuleData)) + ((uint64_t)styleSheetIndex << BitsForPositionInRuleData)+ m_ruleData->position();
+        m_position = ((uint64_t)cascadeOrder << (BitsForStyleSheetIndex + BitsForPositionInRuleData)) + ((uint64_t)styleSheetIndex << BitsForPositionInRuleData) + m_ruleData->position();
     }
 
     const RuleData* ruleData() const { return m_ruleData; }
     uint64_t position() const { return m_position; }
     unsigned specificity() const { return ruleData()->specificity() + m_specificity; }
     const CSSStyleSheet* parentStyleSheet() const { return m_parentStyleSheet; }
     DEFINE_INLINE_TRACE()
     {
         visitor->trace(m_parentStyleSheet);
     }
@@ skipping 54 matching lines @@
 
     void collectMatchingRules(const MatchRequest&, CascadeOrder = ignoreCascadeOrder, bool matchingTreeBoundaryRules = false);
     void collectMatchingShadowHostRules(const MatchRequest&, CascadeOrder = ignoreCascadeOrder);
     void sortAndTransferMatchedRules();
     void clearMatchedRules();
     void addElementStyleProperties(const StylePropertySet*, bool isCacheable = true);
     void finishAddingUARules() { m_result.finishAddingUARules(); }
     void finishAddingAuthorRulesForTreeScope() { m_result.finishAddingAuthorRulesForTreeScope(); }
     void setIncludeEmptyRules(bool include) { m_includeEmptyRules = include; }
     bool includeEmptyRules() const { return m_includeEmptyRules; }
+    bool isCollectingForPseudoElement() const { return m_pseudoStyleRequest.pseudoId != PseudoIdNone; }
 
 private:
     template<typename RuleDataListType>
     void collectMatchingRulesForList(const RuleDataListType*, CascadeOrder, const MatchRequest&);
 
     void didMatchRule(const RuleData&, const SelectorChecker::MatchResult&, CascadeOrder, const MatchRequest&);
 
     template<class CSSRuleCollection>
     CSSRule* findStyleRule(CSSRuleCollection*, StyleRule*);
     void appendCSSOMWrapperForRule(CSSStyleSheet*, StyleRule*);
@@ skipping 19 matching lines @@
 
     // Output.
     RefPtrWillBeMember<StaticCSSRuleList> m_cssRuleList;
     RefPtrWillBeMember<StyleRuleList> m_styleRuleList;
     MatchResult m_result;
 };
 
 } // namespace blink
 
 #endif // ElementRuleCollector_h