Index: third_party/WebKit/Source/core/editing/VisiblePosition.cpp |
diff --git a/third_party/WebKit/Source/core/editing/VisiblePosition.cpp b/third_party/WebKit/Source/core/editing/VisiblePosition.cpp |
index 095ef9f2ddb07c806542c7f7e67e097d7d23ba50..5d3daecb8883a678acff9fe67643b78012425b7b 100644 |
--- a/third_party/WebKit/Source/core/editing/VisiblePosition.cpp |
+++ b/third_party/WebKit/Source/core/editing/VisiblePosition.cpp |
@@ -87,14 +87,14 @@ VisiblePosition createVisiblePosition(const PositionWithAffinity& positionWithAf |
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) |
@@ -102,9 +102,9 @@ VisiblePosition createVisiblePositionInDOMTree(const Position& position, TextAff |
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); |
} |
@@ -135,7 +135,7 @@ void VisiblePositionTemplate<Strategy>::showTreeForThis() const |
#endif |
template class CORE_TEMPLATE_EXPORT VisiblePositionTemplate<EditingStrategy>; |
-template class CORE_TEMPLATE_EXPORT VisiblePositionTemplate<EditingInComposedTreeStrategy>; |
+template class CORE_TEMPLATE_EXPORT VisiblePositionTemplate<EditingInFlatTreeStrategy>; |
} // namespace blink |