blink: Rename enums and functions to not collide with chromium style.

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

 /*
  * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
  *               1999 Waldo Bastian (bastian@kde.org)
  * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010, 2013 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.
  *
@@ skipping 74 matching lines @@
 
     String selectorText(const String& rightSide = "") const;
 
     bool operator==(const CSSSelector&) const;
 
     // http://www.w3.org/TR/css3-selectors/#specificity
     // We use 256 as the base of the specificity number system.
     unsigned specificity() const;
 
     /* how the attribute value has to match.... Default is Exact */
-    enum Match {
+    enum MatchType {

[danakj, 2016/02/24 00:35:24]

Please critique the choices I made in this file, they might be bad.

[pdr., 2016/02/24 00:43:35]

The colors of these sheds is acceptable to my eyes.

         Unknown,
         Tag, // Example: div
         Id, // Example: #id
         Class, // example: .class
         PseudoClass, // Example:  :nth-child(2)
         PseudoElement, // Example: ::first-line
         PagePseudoClass, // ??
         AttributeExact, // Example: E[foo="bar"]
         AttributeSet, // Example: E[foo]
         AttributeHyphen, // Example: E[foo|="bar"]
         AttributeList, // Example: E[foo~="bar"]
         AttributeContain, // css3: E[foo*="bar"]
         AttributeBegin, // css3: E[foo^="bar"]
         AttributeEnd, // css3: E[foo$="bar"]
         FirstAttributeSelectorMatch = AttributeExact,
     };
 
-    enum Relation {
+    enum RelationType {
         SubSelector, // No combinator
         Descendant, // "Space" combinator
         Child, // > combinator
         DirectAdjacent, // + combinator
         IndirectAdjacent, // ~ combinator
         ShadowPseudo, // Special case of shadow DOM pseudo elements / shadow pseudo element
         ShadowDeep, // /deep/ combinator
         ShadowSlot // slotted to <slot> element
     };
 
@@ skipping 80 matching lines @@
         PseudoSpatialNavigationFocus,
         PseudoListBox,
         PseudoSlotted
     };
 
     enum AttributeMatchType {
         CaseSensitive,
         CaseInsensitive,
     };
 
-    PseudoType pseudoType() const { return static_cast<PseudoType>(m_pseudoType); }
+    PseudoType getPseudoType() const { return static_cast<PseudoType>(m_pseudoType); }
     void updatePseudoType(const AtomicString&, bool hasArguments);
 
     static PseudoType parsePseudoType(const AtomicString&, bool hasArguments);
     static PseudoId pseudoId(PseudoType);
 
     // Selectors are kept in an array by CSSSelectorList. The next component of the selector is
     // the next item in the array.
     const CSSSelector* tagHistory() const { return m_isLastInTagHistory ? 0 : const_cast<CSSSelector*>(this + 1); }
 
     const QualifiedName& tagQName() const;
     const AtomicString& value() const;
     const AtomicString& serializingValue() const;
 
     // WARNING: Use of QualifiedName by attribute() is a lie.
     // attribute() will return a QualifiedName with prefix and namespaceURI
     // set to starAtom to mean "matches any namespace". Be very careful
     // how you use the returned QualifiedName.
     // http://www.w3.org/TR/css3-selectors/#attrnmsp
     const QualifiedName& attribute() const;
-    AttributeMatchType attributeMatchType() const;
+    AttributeMatchType attributeMatch() const;
     // Returns the argument of a parameterized selector. For example, :lang(en-US) would have an argument of en-US.
     // Note that :nth-* selectors don't store an argument and just store the numbers.
     const AtomicString& argument() const { return m_hasRareData ? m_data.m_rareData->m_argument : nullAtom; }
     const CSSSelectorList* selectorList() const { return m_hasRareData ? m_data.m_rareData->m_selectorList.get() : nullptr; }
 
 #ifndef NDEBUG
     void show() const;
     void show(int indent) const;
 #endif
 
     bool isASCIILower(const AtomicString& value);
     void setValue(const AtomicString&, bool matchLowerCase);
     void setAttribute(const QualifiedName&, AttributeMatchType);
     void setArgument(const AtomicString&);
     void setSelectorList(PassOwnPtr<CSSSelectorList>);
 
     void setNth(int a, int b);
     bool matchNth(int count) const;
 
     bool isAdjacentSelector() const { return m_relation == DirectAdjacent || m_relation == IndirectAdjacent; }
     bool isShadowSelector() const { return m_relation == ShadowPseudo || m_relation == ShadowDeep; }
     bool isAttributeSelector() const { return m_match >= FirstAttributeSelectorMatch; }
     bool isHostPseudoClass() const { return m_pseudoType == PseudoHost || m_pseudoType == PseudoHostContext; }
     bool isInsertionPointCrossing() const { return m_pseudoType == PseudoHostContext || m_pseudoType == PseudoContent; }
 
-    Relation relation() const { return static_cast<Relation>(m_relation); }
-    void setRelation(Relation relation)
+    RelationType relation() const { return static_cast<RelationType>(m_relation); }
+    void setRelation(RelationType relation)
     {
         m_relation = relation;
-        ASSERT(static_cast<Relation>(m_relation) == relation); // using a bitfield.
+        ASSERT(static_cast<RelationType>(m_relation) == relation); // using a bitfield.
     }
 
-    Match match() const { return static_cast<Match>(m_match); }
-    void setMatch(Match match)
+    MatchType match() const { return static_cast<MatchType>(m_match); }
+    void setMatch(MatchType match)
     {
         m_match = match;
-        ASSERT(static_cast<Match>(m_match) == match); // using a bitfield.
+        ASSERT(static_cast<MatchType>(m_match) == match); // using a bitfield.
     }
 
     bool isLastInSelectorList() const { return m_isLastInSelectorList; }
     void setLastInSelectorList() { m_isLastInSelectorList = true; }
     bool isLastInTagHistory() const { return m_isLastInTagHistory; }
     void setNotLastInTagHistory() { m_isLastInTagHistory = false; }
 
     // http://dev.w3.org/csswg/selectors4/#compound
     bool isCompound() const;
 
     enum LinkMatchMask { MatchLink = 1, MatchVisited = 2, MatchAll = MatchLink | MatchVisited };
     unsigned computeLinkMatchType() const;
 
     bool isForPage() const { return m_isForPage; }
     void setForPage() { m_isForPage = true; }
 
     bool relationIsAffectedByPseudoContent() const { return m_relationIsAffectedByPseudoContent; }
     void setRelationIsAffectedByPseudoContent() { m_relationIsAffectedByPseudoContent = true; }
 
     bool matchesPseudoElement() const;
 
 private:
-    unsigned m_relation               : 3; // enum Relation
-    unsigned m_match                  : 4; // enum Match
+    unsigned m_relation               : 3; // enum RelationType
+    unsigned m_match                  : 4; // enum MatchType
     unsigned m_pseudoType             : 8; // enum PseudoType
     unsigned m_isLastInSelectorList   : 1;
     unsigned m_isLastInTagHistory     : 1;
     unsigned m_hasRareData            : 1;
     unsigned m_isForPage              : 1;
     unsigned m_tagIsImplicit          : 1;
     unsigned m_relationIsAffectedByPseudoContent : 1;
 
     void setPseudoType(PseudoType pseudoType)
     {
@@ skipping 15 matching lines @@
         int nthAValue() const { return m_bits.m_nth.m_a; }
         int nthBValue() const { return m_bits.m_nth.m_b; }
 
         AtomicString m_matchingValue;
         AtomicString m_serializingValue;
         union {
             struct {
                 int m_a; // Used for :nth-*
                 int m_b; // Used for :nth-*
             } m_nth;
-            AttributeMatchType m_attributeMatchType; // used for attribute selector (with value)
+            AttributeMatchType m_attributeMatch; // used for attribute selector (with value)
         } m_bits;
         QualifiedName m_attribute; // used for attribute selector
         AtomicString m_argument; // Used for :contains, :lang, :nth-*
         OwnPtr<CSSSelectorList> m_selectorList; // Used for :-webkit-any and :not
 
     private:
         RareData(const AtomicString& value);
     };
     void createRareData();
 
     union DataUnion {
         DataUnion()
             : m_value(nullptr)
         {
         }
         StringImpl* m_value;
         QualifiedName::QualifiedNameImpl* m_tagQName;
         RareData* m_rareData;
     } m_data;
 };
 
 inline const QualifiedName& CSSSelector::attribute() const
 {
     ASSERT(isAttributeSelector());
     ASSERT(m_hasRareData);
     return m_data.m_rareData->m_attribute;
 }
 
-inline CSSSelector::AttributeMatchType CSSSelector::attributeMatchType() const
+inline CSSSelector::AttributeMatchType CSSSelector::attributeMatch() const
 {
     ASSERT(isAttributeSelector());
     ASSERT(m_hasRareData);
-    return m_data.m_rareData->m_bits.m_attributeMatchType;
+    return m_data.m_rareData->m_bits.m_attributeMatch;
 }
 
 inline bool CSSSelector::isASCIILower(const AtomicString& value)
 {
     for (size_t i = 0; i < value.length(); ++i) {
         if (isASCIIUpper(value[i]))
             return false;
     }
     return true;
 }
@@ skipping 99 matching lines @@
     if (m_hasRareData)
         return m_data.m_rareData->m_serializingValue;
     // AtomicString is really just a StringImpl* so the cast below is safe.
     // FIXME: Perhaps call sites could be changed to accept StringImpl?
     return *reinterpret_cast<const AtomicString*>(&m_data.m_value);
 }
 
 } // namespace blink
 
 #endif // CSSSelector_h