Rename ComposedTree to FlatTree

third_party/WebKit/Source/core/editing/VisiblePosition.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Portions Copyright (c) 2011 Motorola Mobility, 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
@@ skipping 69 matching lines @@
 VisiblePosition createVisiblePosition(const Position& position, TextAffinity affinity)
 {
     return createVisiblePosition(PositionWithAffinity(position, affinity));
 }
 
 VisiblePosition createVisiblePosition(const PositionWithAffinity& positionWithAffinity)
 {
     return VisiblePosition::create(positionWithAffinity);
 }
 
-VisiblePositionInComposedTree createVisiblePosition(const PositionInComposedTree& position, TextAffinity affinity)
+VisiblePositionInFlatTree createVisiblePosition(const PositionInFlatTree& position, TextAffinity affinity)
 {
-    return VisiblePositionInComposedTree::create(PositionInComposedTreeWithAffinity(position, affinity));
+    return VisiblePositionInFlatTree::create(PositionInFlatTreeWithAffinity(position, affinity));
 }
 
-VisiblePositionInComposedTree createVisiblePosition(const PositionInComposedTreeWithAffinity& positionWithAffinity)
+VisiblePositionInFlatTree createVisiblePosition(const PositionInFlatTreeWithAffinity& positionWithAffinity)
 {
-    return VisiblePositionInComposedTree::create(positionWithAffinity);
+    return VisiblePositionInFlatTree::create(positionWithAffinity);
 }
 
 VisiblePosition createVisiblePositionInDOMTree(const Position& position, TextAffinity affinity)
 {
     return createVisiblePosition(position, affinity);
 }
 
-VisiblePosition createVisiblePositionInDOMTree(const PositionInComposedTree& position, TextAffinity affinity)
+VisiblePosition createVisiblePositionInDOMTree(const PositionInFlatTree& position, TextAffinity affinity)
 {
-    const VisiblePositionInComposedTree visiblePosition = createVisiblePosition(position);
+    const VisiblePositionInFlatTree visiblePosition = createVisiblePosition(position);
     return createVisiblePosition(toPositionInDOMTree(visiblePosition.deepEquivalent()), affinity);
 }
 
 #ifndef NDEBUG
 
 template<typename Strategy>
 void VisiblePositionTemplate<Strategy>::debugPosition(const char* msg) const
 {
     if (isNull()) {
         fprintf(stderr, "Position [%s]: null\n", msg);
@@ skipping 10 matching lines @@
 
 template<typename Strategy>
 void VisiblePositionTemplate<Strategy>::showTreeForThis() const
 {
     deepEquivalent().showTreeForThis();
 }
 
 #endif
 
 template class CORE_TEMPLATE_EXPORT VisiblePositionTemplate<EditingStrategy>;
-template class CORE_TEMPLATE_EXPORT VisiblePositionTemplate<EditingInComposedTreeStrategy>;
+template class CORE_TEMPLATE_EXPORT VisiblePositionTemplate<EditingInFlatTreeStrategy>;
 
 } // namespace blink
 
 #ifndef NDEBUG
 
 void showTree(const blink::VisiblePosition* vpos)
 {
     if (vpos)
         vpos->showTreeForThis();
     else
         fprintf(stderr, "Cannot showTree for (nil) VisiblePosition.\n");
 }
 
 void showTree(const blink::VisiblePosition& vpos)
 {
     vpos.showTreeForThis();
 }
 
 #endif