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

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

Index: third_party/WebKit/Source/core/css/CSSSelector.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSSelector.cpp b/third_party/WebKit/Source/core/css/CSSSelector.cpp
index 4a2e23e280e2ee596e9c5c29b028b6d874f15b5d..016e1cf192a7321b2fef441f0ff19729002f0e74 100644
--- a/third_party/WebKit/Source/core/css/CSSSelector.cpp
+++ b/third_party/WebKit/Source/core/css/CSSSelector.cpp
@@ -100,7 +100,7 @@ inline unsigned CSSSelector::specificityForOneSelector() const
     case Id:
         return 0x010000;
     case PseudoClass:
-        switch (pseudoType()) {
+        switch (getPseudoType()) {
         case PseudoHost:
         case PseudoHostContext:
             // We dynamically compute the specificity of :host and :host-context
@@ -148,7 +148,7 @@ unsigned CSSSelector::specificityForPage() const
             s += tagQName().localName() == starAtom ? 0 : 4;
             break;
         case PagePseudoClass:
-            switch (component->pseudoType()) {
+            switch (component->getPseudoType()) {
             case PseudoFirstPage:
                 s += 2;
                 break;
@@ -416,7 +416,7 @@ void CSSSelector::show(int indent) const
     printf("%*sm_match: %d\n", indent, "", m_match);
     if (m_match != Tag)
         printf("%*svalue(): %s\n", indent, "", value().ascii().data());
-    printf("%*spseudoType(): %d\n", indent, "", pseudoType());
+    printf("%*sgetPseudoType(): %d\n", indent, "", getPseudoType());
     if (m_match == Tag)
         printf("%*stagQName().localName: %s\n", indent, "", tagQName().localName().ascii().data());
     printf("%*sisAttributeSelector(): %d\n", indent, "", isAttributeSelector());
@@ -569,7 +569,7 @@ bool CSSSelector::operator==(const CSSSelector& other) const
             || sel1->relation() != sel2->relation()
             || sel1->m_match != sel2->m_match
             || sel1->value() != sel2->value()
-            || sel1->pseudoType() != sel2->pseudoType()
+            || sel1->getPseudoType() != sel2->getPseudoType()
             || sel1->argument() != sel2->argument()) {
             return false;
         }
@@ -613,7 +613,7 @@ String CSSSelector::selectorText(const String& rightSide) const
             str.append(':');
             str.append(cs->serializingValue());
 
-            switch (cs->pseudoType()) {
+            switch (cs->getPseudoType()) {
             case PseudoNthChild:
             case PseudoNthLastChild:
             case PseudoNthOfType:
@@ -691,7 +691,7 @@ String CSSSelector::selectorText(const String& rightSide) const
             }
             if (cs->m_match != AttributeSet) {
                 serializeString(cs->serializingValue(), str);
-                if (cs->attributeMatchType() == CaseInsensitive)
+                if (cs->attributeMatch() == CaseInsensitive)
                     str.appendLiteral(" i");
                 str.append(']');
             }
@@ -739,7 +739,7 @@ void CSSSelector::setAttribute(const QualifiedName& value, AttributeMatchType ma
 {
     createRareData();
     m_data.m_rareData->m_attribute = value;
-    m_data.m_rareData->m_bits.m_attributeMatchType = matchType;
+    m_data.m_rareData->m_bits.m_attributeMatch = matchType;
 }
 
 void CSSSelector::setArgument(const AtomicString& value)
@@ -776,7 +776,7 @@ static bool validateSubSelector(const CSSSelector* selector)
         break;
     }
 
-    switch (selector->pseudoType()) {
+    switch (selector->getPseudoType()) {
     case CSSSelector::PseudoEmpty:
     case CSSSelector::PseudoLink:
     case CSSSelector::PseudoVisited:
@@ -833,13 +833,13 @@ unsigned CSSSelector::computeLinkMatchType() const
     // Determine if this selector will match a link in visited, unvisited or any state, or never.
     // :visited never matches other elements than the innermost link element.
     for (const CSSSelector* current = this; current; current = current->tagHistory()) {
-        switch (current->pseudoType()) {
+        switch (current->getPseudoType()) {
         case PseudoNot:
             {
                 // :not(:visited) is equivalent to :link. Parser enforces that :not can't nest.
                 ASSERT(current->selectorList());
                 for (const CSSSelector* subSelector = current->selectorList()->first(); subSelector; subSelector = subSelector->tagHistory()) {
-                    PseudoType subType = subSelector->pseudoType();
+                    PseudoType subType = subSelector->getPseudoType();
                     if (subType == PseudoVisited)
                         linkMatchType &= ~MatchVisited;
                     else if (subType == PseudoLink)
@@ -857,7 +857,7 @@ unsigned CSSSelector::computeLinkMatchType() const
             // We don't support :link and :visited inside :-webkit-any.
             break;
         }
-        Relation relation = current->relation();
+        RelationType relation = current->relation();
         if (relation == SubSelector)
             continue;
         if (relation != Descendant && relation != Child)