Rename ComposedTree to FlatTree

third_party/WebKit/Source/core/testing/Internals.cpp

Index: third_party/WebKit/Source/core/testing/Internals.cpp
diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp
index 0b114421a6f713017b174f31e97de33a85e05427..d60efc75f62a6723d0f493729e2dd536d5024b6d 100644
--- a/third_party/WebKit/Source/core/testing/Internals.cpp
+++ b/third_party/WebKit/Source/core/testing/Internals.cpp
@@ -59,8 +59,8 @@
 #include "core/dom/StyleEngine.h"
 #include "core/dom/TreeScope.h"
 #include "core/dom/ViewportDescription.h"
-#include "core/dom/shadow/ComposedTreeTraversal.h"
 #include "core/dom/shadow/ElementShadow.h"
+#include "core/dom/shadow/FlatTreeTraversal.h"
 #include "core/dom/shadow/SelectRuleFeatureSet.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/Editor.h"
@@ -592,54 +592,54 @@ size_t Internals::countElementShadow(const Node* root, ExceptionState& exception
     return toShadowRoot(root)->childShadowRootCount();
 }
 
-Node* Internals::nextSiblingInComposedTree(Node* node, ExceptionState& exceptionState)
+Node* Internals::nextSiblingInFlatTree(Node* node, ExceptionState& exceptionState)
 {
     ASSERT(node);
-    if (!node->canParticipateInComposedTree()) {
-        exceptionState.throwDOMException(InvalidAccessError, "The node argument doesn't particite in the composed tree.");
+    if (!node->canParticipateInFlatTree()) {
+        exceptionState.throwDOMException(InvalidAccessError, "The node argument doesn't particite in the flat tree.");
         return 0;
     }
-    return ComposedTreeTraversal::nextSibling(*node);
+    return FlatTreeTraversal::nextSibling(*node);
 }
 
-Node* Internals::firstChildInComposedTree(Node* node, ExceptionState& exceptionState)
+Node* Internals::firstChildInFlatTree(Node* node, ExceptionState& exceptionState)
 {
     ASSERT(node);
-    if (!node->canParticipateInComposedTree()) {
-        exceptionState.throwDOMException(InvalidAccessError, "The node argument doesn't particite in the composed tree");
+    if (!node->canParticipateInFlatTree()) {
+        exceptionState.throwDOMException(InvalidAccessError, "The node argument doesn't particite in the flat tree");
         return 0;
     }
-    return ComposedTreeTraversal::firstChild(*node);
+    return FlatTreeTraversal::firstChild(*node);
 }
 
-Node* Internals::lastChildInComposedTree(Node* node, ExceptionState& exceptionState)
+Node* Internals::lastChildInFlatTree(Node* node, ExceptionState& exceptionState)
 {
     ASSERT(node);
-    if (!node->canParticipateInComposedTree()) {
-        exceptionState.throwDOMException(InvalidAccessError, "The node argument doesn't particite in the composed tree.");
+    if (!node->canParticipateInFlatTree()) {
+        exceptionState.throwDOMException(InvalidAccessError, "The node argument doesn't particite in the flat tree.");
         return 0;
     }
-    return ComposedTreeTraversal::lastChild(*node);
+    return FlatTreeTraversal::lastChild(*node);
 }
 
-Node* Internals::nextInComposedTree(Node* node, ExceptionState& exceptionState)
+Node* Internals::nextInFlatTree(Node* node, ExceptionState& exceptionState)
 {
     ASSERT(node);
-    if (!node->canParticipateInComposedTree()) {
-        exceptionState.throwDOMException(InvalidAccessError, "The node argument doesn't particite in the composed tree.");
+    if (!node->canParticipateInFlatTree()) {
+        exceptionState.throwDOMException(InvalidAccessError, "The node argument doesn't particite in the flat tree.");
         return 0;
     }
-    return ComposedTreeTraversal::next(*node);
+    return FlatTreeTraversal::next(*node);
 }
 
-Node* Internals::previousInComposedTree(Node* node, ExceptionState& exceptionState)
+Node* Internals::previousInFlatTree(Node* node, ExceptionState& exceptionState)
 {
     ASSERT(node);
-    if (!node->canParticipateInComposedTree()) {
-        exceptionState.throwDOMException(InvalidAccessError, "The node argument doesn't particite in the composed tree.");
+    if (!node->canParticipateInFlatTree()) {
+        exceptionState.throwDOMException(InvalidAccessError, "The node argument doesn't particite in the flat tree.");
         return 0;
     }
-    return ComposedTreeTraversal::previous(*node);
+    return FlatTreeTraversal::previous(*node);
 }
 
 String Internals::elementLayoutTreeAsText(Element* element, ExceptionState& exceptionState)