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

third_party/WebKit/Source/core/dom/Text.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 48 matching lines @@
     // Remove empty text nodes.
     if (!length()) {
         // Care must be taken to get the next node before removing the current node.
         RefPtrWillBeRawPtr<Node> nextNode(NodeTraversal::nextPostOrder(*this));
         remove(IGNORE_EXCEPTION);
         return nextNode.release();
     }
 
     // Merge text nodes.
     while (Node* nextSibling = this->nextSibling()) {
-        if (nextSibling->nodeType() != TEXT_NODE)
+        if (nextSibling->getNodeType() != TEXT_NODE)
             break;
 
         RefPtrWillBeRawPtr<Text> nextText = toText(nextSibling);
 
         // Remove empty text nodes.
         if (!nextText->length()) {
             nextText->remove(IGNORE_EXCEPTION);
             continue;
         }
 
@@ skipping 48 matching lines @@
 
     if (parentNode())
         document().didSplitTextNode(*this);
 
     return newText.release();
 }
 
 static const Text* earliestLogicallyAdjacentTextNode(const Text* t)
 {
     for (const Node* n = t->previousSibling(); n; n = n->previousSibling()) {
-        Node::NodeType type = n->nodeType();
+        Node::NodeType type = n->getNodeType();
         if (type == Node::TEXT_NODE || type == Node::CDATA_SECTION_NODE) {
             t = toText(n);
             continue;
         }
 
         break;
     }
     return t;
 }
 
 static const Text* latestLogicallyAdjacentTextNode(const Text* t)
 {
     for (const Node* n = t->nextSibling(); n; n = n->nextSibling()) {
-        Node::NodeType type = n->nodeType();
+        Node::NodeType type = n->getNodeType();
         if (type == Node::TEXT_NODE || type == Node::CDATA_SECTION_NODE) {
             t = toText(n);
             continue;
         }
 
         break;
     }
     return t;
 }
 
@@ skipping 57 matching lines @@
 
     setData(newText);
     return protectedThis.release();
 }
 
 String Text::nodeName() const
 {
     return "#text";
 }
 
-Node::NodeType Text::nodeType() const
+Node::NodeType Text::getNodeType() const
 {
     return TEXT_NODE;
 }
 
 PassRefPtrWillBeRawPtr<Node> Text::cloneNode(bool /*deep*/)
 {
     return cloneWithData(data());
 }
 
 static inline bool canHaveWhitespaceChildren(const LayoutObject& parent, Text* text)
@@ skipping 121 matching lines @@
     }
 
     if (layoutObjectIsNeeded == !!layoutObject())
         return;
 
     // The following is almost the same as Node::reattach() except that we create a layoutObject only if needed.
     // Not calling reattach() to avoid repeated calls to Text::textLayoutObjectIsNeeded().
     AttachContext reattachContext(context);
     reattachContext.performingReattach = true;
 
-    if (styleChangeType() < NeedsReattachStyleChange)
+    if (getStyleChangeType() < NeedsReattachStyleChange)
         detach(reattachContext);
     if (layoutObjectIsNeeded)
         LayoutTreeBuilderForText(*this, layoutParent->layoutObject()).createLayoutObject();
     CharacterData::attach(reattachContext);
 }
 
 void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling)
 {
     if (LayoutTextItem layoutItem = LayoutTextItem(this->layoutObject())) {
         if (change != NoChange || needsStyleRecalc())
@@ skipping 57 matching lines @@
             result.appendLiteral("; ");
         result.appendLiteral("value=");
         result.append(s);
     }
 
     strncpy(buffer, result.toString().utf8().data(), length - 1);
 }
 #endif
 
 } // namespace blink