Rename ComposedTree to FlatTree

third_party/WebKit/Source/core/editing/Position.h

 /*
  * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 154 matching lines @@
     static bool offsetIsBeforeLastNodeOffset(int offset, Node* anchorNode);
     static PositionTemplate<Strategy> firstPositionInOrBeforeNode(Node* anchorNode);
     static PositionTemplate<Strategy> lastPositionInOrAfterNode(Node* anchorNode);
 
     void debugPosition(const char* msg = "") const;
 
 #ifndef NDEBUG
     void formatForDebugger(char* buffer, unsigned length) const;
     void showAnchorTypeAndOffset() const;
     void showTreeForThis() const;
-    void showTreeForThisInComposedTree() const;
+    void showTreeForThisInFlatTree() const;
 #endif
 
     DEFINE_INLINE_TRACE()
     {
         visitor->trace(m_anchorNode);
     }
 
 private:
     bool isAfterAnchorOrAfterChildren() const
     {
         return isAfterAnchor() || isAfterChildren();
     }
 
     RefPtrWillBeMember<Node> m_anchorNode;
     // m_offset can be the offset inside m_anchorNode, or if editingIgnoresContent(m_anchorNode)
     // returns true, then other places in editing will treat m_offset == 0 as "before the anchor"
     // and m_offset > 0 as "after the anchor node".  See parentAnchoredEquivalent for more info.
     int m_offset;
     PositionAnchorType m_anchorType;
 };
 
 extern template class CORE_EXTERN_TEMPLATE_EXPORT PositionTemplate<EditingStrategy>;
-extern template class CORE_EXTERN_TEMPLATE_EXPORT PositionTemplate<EditingInComposedTreeStrategy>;
+extern template class CORE_EXTERN_TEMPLATE_EXPORT PositionTemplate<EditingInFlatTreeStrategy>;
 
 using Position = PositionTemplate<EditingStrategy>;
-using PositionInComposedTree = PositionTemplate<EditingInComposedTreeStrategy>;
+using PositionInFlatTree = PositionTemplate<EditingInFlatTreeStrategy>;
 
 template <typename Strategy>
 bool operator==(const PositionTemplate<Strategy>& a, const PositionTemplate<Strategy>& b)
 {
     if (a.isNull())
         return b.isNull();
 
     if (a.anchorNode() != b.anchorNode() || a.anchorType() != b.anchorType())
         return false;
 
@@ skipping 152 matching lines @@
 }
 
 template <typename Strategy>
 PositionTemplate<Strategy> PositionTemplate<Strategy>::lastPositionInOrAfterNode(Node* node)
 {
     if (!node)
         return PositionTemplate<Strategy>();
     return Strategy::editingIgnoresContent(node) ? afterNode(node) : lastPositionInNode(node);
 }
 
-CORE_EXPORT PositionInComposedTree toPositionInComposedTree(const Position&);
+CORE_EXPORT PositionInFlatTree toPositionInFlatTree(const Position&);
 CORE_EXPORT Position toPositionInDOMTree(const Position&);
-CORE_EXPORT Position toPositionInDOMTree(const PositionInComposedTree&);
+CORE_EXPORT Position toPositionInDOMTree(const PositionInFlatTree&);
 
 template <typename Strategy>
 PositionTemplate<Strategy> fromPositionInDOMTree(const Position&);
 
 template <>
 inline Position fromPositionInDOMTree<EditingStrategy>(const Position& position)
 {
     return position;
 }
 
 template <>
-inline PositionInComposedTree fromPositionInDOMTree<EditingInComposedTreeStrategy>(const Position& position)
+inline PositionInFlatTree fromPositionInDOMTree<EditingInFlatTreeStrategy>(const Position& position)
 {
-    return toPositionInComposedTree(position);
+    return toPositionInFlatTree(position);
 }
 
 // These printers are available only for testing in "webkit_unit_tests", and
 // implemented in "core/testing/CoreTestPrinters.cpp".
 std::ostream& operator<<(std::ostream&, const Node&);
 std::ostream& operator<<(std::ostream&, const Node*);
 
 std::ostream& operator<<(std::ostream&, PositionAnchorType);
 std::ostream& operator<<(std::ostream&, const Position&);
-std::ostream& operator<<(std::ostream&, const PositionInComposedTree&);
+std::ostream& operator<<(std::ostream&, const PositionInFlatTree&);
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::Position&);
 void showTree(const blink::Position*);
 #endif
 
 #endif // Position_h