webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 8 insertions, 8 deletions

diff --git a/Source/WebCore/dom/TextNodeTraversal.cpp b/Source/WebCore/dom/TextNodeTraversal.cpp
index 1f30afeca..112a28486 100644
--- a/Source/WebCore/dom/TextNodeTraversal.cpp
+++ b/Source/WebCore/dom/TextNodeTraversal.cpp
@@ -32,25 +32,25 @@
 namespace WebCore {
 namespace TextNodeTraversal {
 
-void appendContents(const ContainerNode* root, StringBuilder& result)
+void appendContents(const ContainerNode& root, StringBuilder& result)
 {
-    for (Text* text = TextNodeTraversal::firstWithin(root); text; text = TextNodeTraversal::next(text, root))
+    for (Text* text = TextNodeTraversal::firstWithin(root); text; text = TextNodeTraversal::next(*text, &root))
         result.append(text->data());
 }
 
-String contentsAsString(const ContainerNode* root)
+String contentsAsString(const ContainerNode& root)
 {
     StringBuilder result;
     appendContents(root, result);
     return result.toString();
 }
 
-String contentsAsString(const Node* root)
+String contentsAsString(const Node& root)
 {
-    if (root->isTextNode())
-        return toText(root)->data();
-    if (root->isContainerNode())
-        return contentsAsString(toContainerNode(root));
+    if (is<Text>(root))
+        return downcast<Text>(root).data();
+    if (is<ContainerNode>(root))
+        return contentsAsString(downcast<ContainerNode>(root));
     return String();
 }