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

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

 /*
  * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
  * Copyright (C) 2006, 2009 Apple Inc.
  * 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 116 matching lines @@
 
 void LocationPath::evaluate(EvaluationContext& context, NodeSet& nodes) const
 {
     bool resultIsSorted = nodes.isSorted();
 
     for (unsigned i = 0; i < m_steps.size(); i++) {
         Step* step = m_steps[i];
         NodeSet* newNodes = NodeSet::create();
         WillBeHeapHashSet<RawPtrWillBeMember<Node>> newNodesSet;
 
-        bool needToCheckForDuplicateNodes = !nodes.subtreesAreDisjoint() || (step->axis() != Step::ChildAxis && step->axis() != Step::SelfAxis
-            && step->axis() != Step::DescendantAxis && step->axis() != Step::DescendantOrSelfAxis && step->axis() != Step::AttributeAxis);
+        bool needToCheckForDuplicateNodes = !nodes.subtreesAreDisjoint() || (step->getAxis() != Step::ChildAxis && step->getAxis() != Step::SelfAxis
+            && step->getAxis() != Step::DescendantAxis && step->getAxis() != Step::DescendantOrSelfAxis && step->getAxis() != Step::AttributeAxis);
 
         if (needToCheckForDuplicateNodes)
             resultIsSorted = false;
 
         // This is a simplified check that can be improved to handle more cases.
-        if (nodes.subtreesAreDisjoint() && (step->axis() == Step::ChildAxis || step->axis() == Step::SelfAxis))
+        if (nodes.subtreesAreDisjoint() && (step->getAxis() == Step::ChildAxis || step->getAxis() == Step::SelfAxis))
             newNodes->markSubtreesDisjoint(true);
 
         for (unsigned j = 0; j < nodes.size(); j++) {
             NodeSet* matches = NodeSet::create();
             step->evaluate(context, nodes[j], *matches);
 
             if (!matches->isSorted())
                 resultIsSorted = false;
 
             for (size_t nodeIndex = 0; nodeIndex < matches->size(); ++nodeIndex) {
@@ skipping 54 matching lines @@
 
     NodeSet& nodes = v.modifiableNodeSet(context);
     m_path->evaluate(context, nodes);
 
     return v;
 }
 
 } // namespace XPath
 
 } // namespace blink