From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/dom/TextNodeTraversal.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/WebCore/dom/TextNodeTraversal.cpp') 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(root)) + return downcast(root).data(); + if (is(root)) + return contentsAsString(downcast(root)); return String(); } -- cgit v1.2.1