Simplify Node::textContent().

sky/engine/core/dom/Node.cpp

 /*
  * 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 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 888 matching lines @@
 
 ContainerNode* Node::ownerScope() const
 {
     if (inDocument())
         return &treeScope().rootNode();
     if (ShadowRoot* root = containingShadowRoot())
         return root;
     return 0;
 }
 
-static void appendTextContent(const Node* node, bool convertBRsToNewlines, StringBuilder& content)
-{
-    if (node->nodeType() == Node::TEXT_NODE) {
-        content.append(toCharacterData(node)->data());
-        return;
-    }
-
-    for (Node* child = toContainerNode(node)->firstChild(); child; child = child->nextSibling()) {
-        appendTextContent(child, convertBRsToNewlines, content);
-    }
-}
-
-String Node::textContent(bool convertBRsToNewlines) const
+String Node::textContent() const
 {
     StringBuilder content;
-    appendTextContent(this, convertBRsToNewlines, content);
+    for (const Node* node = this; node; node = NodeTraversal::next(*node, this)) {
+        if (node->isTextNode())
+            content.append(toText(node)->data());
+    }
     return content.toString();
 }
 
 void Node::setTextContent(const String& text)
 {
     switch (nodeType()) {
         case TEXT_NODE:
             toText(this)->setData(text);
             return;
         case ELEMENT_NODE:
@@ skipping 803 matching lines @@
         node->showTreeForThis();
 }
 
 void showNodePath(const blink::Node* node)
 {
     if (node)
         node->showNodePathForThis();
 }
 
 #endif