| Index: third_party/WebKit/Source/core/dom/ElementTraversal.h
|
| diff --git a/third_party/WebKit/Source/core/dom/ElementTraversal.h b/third_party/WebKit/Source/core/dom/ElementTraversal.h
|
| index 26fda46f3862629b89a2b3de2a9215f3fdb5a481..e880d3bfdae2a43c1b1300ce29d1d4b9a5699405 100644
|
| --- a/third_party/WebKit/Source/core/dom/ElementTraversal.h
|
| +++ b/third_party/WebKit/Source/core/dom/ElementTraversal.h
|
| @@ -281,6 +281,8 @@ template <class ElementType>
|
| template <class NodeType>
|
| inline ElementType* Traversal<ElementType>::firstChildTemplate(
|
| NodeType& current) {
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |firstChild|, not |FirstChild| below. */
|
| Node* node = current.firstChild();
|
| while (node && !isElementOfType<const ElementType>(*node))
|
| node = node->nextSibling();
|
| @@ -319,6 +321,8 @@ template <class ElementType>
|
| template <class NodeType>
|
| inline ElementType* Traversal<ElementType>::lastChildTemplate(
|
| NodeType& current) {
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |lastChild|, not |LastChild| below. */
|
| Node* node = current.lastChild();
|
| while (node && !isElementOfType<const ElementType>(*node))
|
| node = node->previousSibling();
|
| @@ -340,6 +344,8 @@ template <class ElementType>
|
| template <class NodeType>
|
| inline ElementType* Traversal<ElementType>::firstWithinTemplate(
|
| NodeType& current) {
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |firstChild|, not |FirstChild| below. */
|
| Node* node = current.firstChild();
|
| while (node && !isElementOfType<const ElementType>(*node))
|
| node = NodeTraversal::next(*node, ¤t);
|
|
|