Rename ComposedTree to FlatTree

third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 57 matching lines @@
 
 template <>
 TextIteratorBehaviorFlags adjustBehaviorFlags<EditingStrategy>(TextIteratorBehaviorFlags flags)
 {
     if (flags & TextIteratorForSelectionToString)
         return flags | TextIteratorExcludeAutofilledValue;
     return flags;
 }
 
 template <>
-TextIteratorBehaviorFlags adjustBehaviorFlags<EditingInComposedTreeStrategy>(TextIteratorBehaviorFlags flags)
+TextIteratorBehaviorFlags adjustBehaviorFlags<EditingInFlatTreeStrategy>(TextIteratorBehaviorFlags flags)
 {
     if (flags & TextIteratorForSelectionToString)
         flags |= TextIteratorExcludeAutofilledValue;
     return flags & ~(TextIteratorEntersOpenShadowRoots | TextIteratorEntersTextControls);
 }
 
 // This function is like Range::pastLastNode, except for the fact that it can
 // climb up out of shadow trees.
 template <typename Strategy>
 Node* pastLastNode(const Node& rangeEndContainer, int rangeEndOffset)
@@ skipping 19 matching lines @@
 {
     const TreeScope* commonAncestorTreeScope = startContainer.treeScope().commonAncestorTreeScope(endContainer.treeScope());
     ASSERT(commonAncestorTreeScope);
     int shadowDepth = 0;
     for (const TreeScope* treeScope = &startContainer.treeScope(); treeScope != commonAncestorTreeScope; treeScope = treeScope->parentTreeScope())
         ++shadowDepth;
     return shadowDepth;
 }
 
 template <>
-int shadowDepthOf<EditingInComposedTreeStrategy>(const Node& startContainer, const Node& endContainer)
+int shadowDepthOf<EditingInFlatTreeStrategy>(const Node& startContainer, const Node& endContainer)
 {
     return 0;
 }
 
 } // namespace
 
 template<typename Strategy>
 TextIteratorAlgorithm<Strategy>::TextIteratorAlgorithm(const PositionTemplate<Strategy>& start, const PositionTemplate<Strategy>& end, TextIteratorBehaviorFlags behavior)
     : m_offset(0)
     , m_startContainer(nullptr)
@@ skipping 203 matching lines @@
                 if (m_textState.positionNode())
                     return;
             }
         }
 
         // Find a new current node to handle in depth-first manner,
         // calling exitNode() as we come back thru a parent node.
         //
         // 1. Iterate over child nodes, if we haven't done yet.
         // To support |TextIteratorEmitsImageAltText|, we don't traversal child
-        // nodes, in composed tree.
+        // nodes, in flat tree.
         Node* next = m_iterationProgress < HandledChildren && !isHTMLImageElement(*m_node) ? Strategy::firstChild(*m_node) : nullptr;
         m_offset = 0;
         if (!next) {
             // 2. If we've already iterated children or they are not available, go to the next sibling node.
             next = Strategy::nextSibling(*m_node);
             if (!next) {
                 // 3. If we are at the last child, go up the node tree until we find a next sibling.
                 bool pastEnd = Strategy::next(*m_node) == m_pastEndNode;
                 ContainerNode* parentNode = Strategy::parent(*m_node);
                 while (!next && parentNode) {
@@ skipping 805 matching lines @@
         return emptyString();
 
     return builder.toString();
 }
 
 String plainText(const EphemeralRange& range, TextIteratorBehaviorFlags behavior)
 {
     return createPlainText<EditingStrategy>(range, behavior);
 }
 
-String plainText(const EphemeralRangeInComposedTree& range, TextIteratorBehaviorFlags behavior)
+String plainText(const EphemeralRangeInFlatTree& range, TextIteratorBehaviorFlags behavior)
 {
-    return createPlainText<EditingInComposedTreeStrategy>(range, behavior);
+    return createPlainText<EditingInFlatTreeStrategy>(range, behavior);
 }
 
 template class CORE_TEMPLATE_EXPORT TextIteratorAlgorithm<EditingStrategy>;
-template class CORE_TEMPLATE_EXPORT TextIteratorAlgorithm<EditingInComposedTreeStrategy>;
+template class CORE_TEMPLATE_EXPORT TextIteratorAlgorithm<EditingInFlatTreeStrategy>;
 
 } // namespace blink