ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

third_party/WebKit/Source/core/dom/NodeTraversal.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2014 Samsung Electronics. All rights reserved.
  *
@@ skipping 331 matching lines @@
 };
 
 inline TraversalRange<TraversalNextIterator<NodeTraversal>>
 NodeTraversal::startsAfter(const Node& start) {
   return TraversalRange<TraversalNextIterator<NodeTraversal>>(
       NodeTraversal::next(start));
 };
 
 template <class NodeType>
 inline Node* NodeTraversal::traverseNextTemplate(NodeType& current) {
+  /* DO NOT SUBMIT - conflict resolution marker */
+  /* Below we should have: hasChildren, firstChild, nextSibling, etc. */
   if (current.hasChildren())
     return current.firstChild();
   if (current.nextSibling())
     return current.nextSibling();
   return nextAncestorSibling(current);
 }
 
 template <class NodeType>
 inline Node* NodeTraversal::traverseNextTemplate(NodeType& current,
                                                  const Node* stayWithin) {
+  /* DO NOT SUBMIT - conflict resolution marker */
+  /* Below we should have: hasChildren, firstChild, nextSibling, etc. */
   if (current.hasChildren())
     return current.firstChild();
   if (current == stayWithin)
     return 0;
   if (current.nextSibling())
     return current.nextSibling();
+<<<<<<< HEAD
   return nextAncestorSibling(current, stayWithin);
+=======
+  return NextAncestorSibling(current, stay_within);
+>>>>>>> 5c8ef794871f... More fixes.
 }
 
 inline Node* NodeTraversal::nextSkippingChildren(const Node& current) {
   if (current.nextSibling())
     return current.nextSibling();
   return nextAncestorSibling(current);
 }
 
 inline Node* NodeTraversal::nextSkippingChildren(const Node& current,
                                                  const Node* stayWithin) {
   if (current == stayWithin)
     return 0;
   if (current.nextSibling())
     return current.nextSibling();
   return nextAncestorSibling(current, stayWithin);
 }
 
 inline Node& NodeTraversal::highestAncestorOrSelf(Node& current) {
   Node* highest = &current;
   while (highest->parentNode())
     highest = highest->parentNode();
   return *highest;
 }
 
 template <class NodeType>
-inline Node* NodeTraversal::childAtTemplate(NodeType& parent, unsigned index) {
+inline Node* NodeTraversal::ChildAtTemplate(NodeType& parent, unsigned index) {
+  /* DO NOT SUBMIT - conflict resolution marker */
+  /* Below we should have: hasChildren, firstChild, nextSibling, etc. */
   Node* child = parent.firstChild();
   while (child && index--)
     child = child->nextSibling();
   return child;
 }
 
 }  // namespace blink
 
 #endif