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

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

Index: third_party/WebKit/Source/core/dom/NodeTraversal.h
diff --git a/third_party/WebKit/Source/core/dom/NodeTraversal.h b/third_party/WebKit/Source/core/dom/NodeTraversal.h
index 7cfd2597f5d1d934a879234499fd8500f3b89910..3e7a8014c655ab87e9e2959e191403407e0823fe 100644
--- a/third_party/WebKit/Source/core/dom/NodeTraversal.h
+++ b/third_party/WebKit/Source/core/dom/NodeTraversal.h
@@ -349,6 +349,8 @@ NodeTraversal::startsAfter(const Node& 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())
@@ -359,13 +361,19 @@ inline Node* NodeTraversal::traverseNextTemplate(NodeType& 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) {
@@ -391,7 +399,9 @@ inline Node& NodeTraversal::highestAncestorOrSelf(Node& current) {
 }
 
 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();