Rename enums/functions that collide in chromium style in core/svg,xml

third_party/WebKit/Source/core/xml/XPathStep.cpp

 /*
  * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
  * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 68 matching lines @@
         } else {
             remainingPredicates.append(predicate);
         }
     }
     swap(remainingPredicates, m_predicates);
 }
 
 bool optimizeStepPair(Step* first, Step* second)
 {
     if (first->m_axis == Step::DescendantOrSelfAxis
-        && first->nodeTest().kind() == Step::NodeTest::AnyNodeTest
+        && first->nodeTest().getKind() == Step::NodeTest::AnyNodeTest
         && !first->m_predicates.size()
         && !first->nodeTest().mergedPredicates().size()) {
 
         ASSERT(first->nodeTest().data().isEmpty());
         ASSERT(first->nodeTest().namespaceURI().isEmpty());
 
         // Optimize the common case of "//" AKA
         // /descendant-or-self::node()/child::NodeTest to /descendant::NodeTest.
         if (second->m_axis == Step::ChildAxis && second->predicatesAreContextListInsensitive()) {
             first->m_axis = Step::DescendantAxis;
-            first->nodeTest() = Step::NodeTest(second->nodeTest().kind(), second->nodeTest().data(), second->nodeTest().namespaceURI());
+            first->nodeTest() = Step::NodeTest(second->nodeTest().getKind(), second->nodeTest().data(), second->nodeTest().namespaceURI());
             swap(second->nodeTest().mergedPredicates(), first->nodeTest().mergedPredicates());
             swap(second->m_predicates, first->m_predicates);
             first->optimize();
             return true;
         }
     }
     return false;
 }
 
 bool Step::predicatesAreContextListInsensitive() const
@@ skipping 49 matching lines @@
         return Node::ATTRIBUTE_NODE;
     default:
         return Node::ELEMENT_NODE;
     }
 }
 #endif
 
 // Evaluate NodeTest without considering merged predicates.
 static inline bool nodeMatchesBasicTest(Node* node, Step::Axis axis, const Step::NodeTest& nodeTest)
 {
-    switch (nodeTest.kind()) {
+    switch (nodeTest.getKind()) {
     case Step::NodeTest::TextNodeTest: {
         Node::NodeType type = node->getNodeType();
         return type == Node::TEXT_NODE || type == Node::CDATA_SECTION_NODE;
     }
     case Step::NodeTest::CommentNodeTest:
         return node->getNodeType() == Node::COMMENT_NODE;
     case Step::NodeTest::ProcessingInstructionNodeTest: {
         const AtomicString& name = nodeTest.data();
         return node->getNodeType() == Node::PROCESSING_INSTRUCTION_NODE && (name.isEmpty() || node->nodeName() == name);
     }
@@ skipping 182 matching lines @@
         return;
     }
 
     case AttributeAxis: {
         if (!context->isElementNode())
             return;
 
         Element* contextElement = toElement(context);
         // Avoid lazily creating attribute nodes for attributes that we do not
         // need anyway.
-        if (nodeTest().kind() == NodeTest::NameTest && nodeTest().data() != starAtom) {
+        if (nodeTest().getKind() == NodeTest::NameTest && nodeTest().data() != starAtom) {
             RefPtrWillBeRawPtr<Attr> attr = contextElement->getAttributeNodeNS(nodeTest().namespaceURI(), nodeTest().data());
             // In XPath land, namespace nodes are not accessible on the attribute axis.
             if (attr && attr->namespaceURI() != XMLNSNames::xmlnsNamespaceURI) {
                 // Still need to check merged predicates.
                 if (nodeMatches(evaluationContext, attr.get(), AttributeAxis, nodeTest()))
                     nodes.append(attr.release());
             }
             return;
         }
 
@@ skipping 44 matching lines @@
         nodes.markSorted(false);
         return;
     }
     }
     ASSERT_NOT_REACHED();
 }
 
 } // namespace XPath
 
 } // namespace blink