Rename enums/functions that collide in chromium style in core/dom/

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

Index: third_party/WebKit/Source/core/dom/Node.h
diff --git a/third_party/WebKit/Source/core/dom/Node.h b/third_party/WebKit/Source/core/dom/Node.h
index 21b6821f56161b2b392295a405776ba497c814ef..84173d22f9c2389018f0e44203882d4d73d859e9 100644
--- a/third_party/WebKit/Source/core/dom/Node.h
+++ b/third_party/WebKit/Source/core/dom/Node.h
@@ -204,7 +204,7 @@ public:
     virtual String nodeName() const = 0;
     virtual String nodeValue() const;
     virtual void setNodeValue(const String&);
-    virtual NodeType nodeType() const = 0;
+    virtual NodeType getNodeType() const = 0;

[pdr., 2016/02/25 01:11:29]

This one is tough because it mirrors the JS api (Node.nodeType). Type() is
another option, but I think the one you used is the best we can do here.

     ContainerNode* parentNode() const;
     Element* parentElement() const;
     ContainerNode* parentElementOrShadowRoot() const;
@@ -362,9 +362,9 @@ public:
     // to check which element is exactly focused.
     bool focused() const { return isUserActionElement() && isUserActionElementFocused(); }
 
-    bool needsAttach() const { return styleChangeType() == NeedsReattachStyleChange; }
-    bool needsStyleRecalc() const { return styleChangeType() != NoStyleChange; }
-    StyleChangeType styleChangeType() const { return static_cast<StyleChangeType>(m_nodeFlags & StyleChangeMask); }
+    bool needsAttach() const { return getStyleChangeType() == NeedsReattachStyleChange; }
+    bool needsStyleRecalc() const { return getStyleChangeType() != NoStyleChange; }
+    StyleChangeType getStyleChangeType() const { return static_cast<StyleChangeType>(m_nodeFlags & StyleChangeMask); }
     bool childNeedsStyleRecalc() const { return getFlag(ChildNeedsStyleRecalcFlag); }
     bool isLink() const { return getFlag(IsLinkFlag); }
     bool isEditingText() const { ASSERT(isTextNode()); return getFlag(HasNameOrIsEditingTextFlag); }
@@ -492,7 +492,7 @@ public:
     bool isChildOfV0ShadowHost() const;
     bool isSlotAssignable() const { return isTextNode() || isElementNode(); }
 
-    bool isDocumentTypeNode() const { return nodeType() == DOCUMENT_TYPE_NODE; }
+    bool isDocumentTypeNode() const { return getNodeType() == DOCUMENT_TYPE_NODE; }
     virtual bool childTypeAllowed(NodeType) const { return false; }
     unsigned countChildren() const;
 
@@ -865,7 +865,7 @@ inline ContainerNode* Node::parentNode() const
 
 inline void Node::lazyReattachIfAttached()
 {
-    if (styleChangeType() == NeedsReattachStyleChange)
+    if (getStyleChangeType() == NeedsReattachStyleChange)
         return;
     if (!inActiveDocument())
         return;