| Index: Source/core/editing/VisiblePosition.cpp
|
| diff --git a/Source/core/editing/VisiblePosition.cpp b/Source/core/editing/VisiblePosition.cpp
|
| index 44973afe8db45b8b4280c2da9103552eb7fdcef5..e618d6d85e6344381b8c741fa40b87d1ac7a910d 100644
|
| --- a/Source/core/editing/VisiblePosition.cpp
|
| +++ b/Source/core/editing/VisiblePosition.cpp
|
| @@ -52,8 +52,8 @@ using namespace HTMLNames;
|
| VisiblePosition::VisiblePosition(const Position& position, TextAffinity affinity)
|
| {
|
| // TODO(yosin) We should make |VisiblePosition| private and make this
|
| - // constructor to populate member variables by using |visiblePositionOf()|.
|
| - *this = visiblePositionOf(position, affinity);
|
| + // constructor to populate member variables by using |createVisiblePosition()|.
|
| + *this = createVisiblePosition(position, affinity);
|
| }
|
|
|
| VisiblePosition VisiblePosition::createWithoutCanonicalization(const PositionWithAffinity& canonicalized)
|
| @@ -434,7 +434,7 @@ PositionInComposedTreeWithAffinity honorEditingBoundaryAtOrBeforeOf(const Positi
|
|
|
| VisiblePosition honorEditingBoundaryAtOrBefore(const VisiblePosition& pos, const Position& anchor)
|
| {
|
| - return visiblePositionOf(honorEditingBoundaryAtOrBeforeOf(pos.toPositionWithAffinity(), anchor));
|
| + return createVisiblePosition(honorEditingBoundaryAtOrBeforeOf(pos.toPositionWithAffinity(), anchor));
|
| }
|
|
|
| VisiblePosition honorEditingBoundaryAtOrAfter(const VisiblePosition& pos, const Position& anchor)
|
| @@ -559,7 +559,7 @@ PositionInComposedTree canonicalPositionOf(const PositionInComposedTree& positio
|
| }
|
|
|
| template<typename Strategy>
|
| -static PositionWithAffinityTemplate<Strategy> visiblePositionOfAlgorithm(const PositionAlgorithm<Strategy>& position, TextAffinity affinity)
|
| +static PositionWithAffinityTemplate<Strategy> createVisiblePositionAlgorithm(const PositionAlgorithm<Strategy>& position, TextAffinity affinity)
|
| {
|
| const PositionAlgorithm<Strategy> deepPosition = canonicalPosition(position);
|
| if (deepPosition.isNull())
|
| @@ -574,19 +574,19 @@ static PositionWithAffinityTemplate<Strategy> visiblePositionOfAlgorithm(const P
|
| return PositionWithAffinityTemplate<Strategy>(deepPosition, TextAffinity::Upstream);
|
| }
|
|
|
| -VisiblePosition visiblePositionOf(const Position& position, TextAffinity affinity)
|
| +VisiblePosition createVisiblePosition(const Position& position, TextAffinity affinity)
|
| {
|
| - return VisiblePosition::createWithoutCanonicalization(visiblePositionOfAlgorithm<EditingStrategy>(position, affinity));
|
| + return VisiblePosition::createWithoutCanonicalization(createVisiblePositionAlgorithm<EditingStrategy>(position, affinity));
|
| }
|
|
|
| -VisiblePosition visiblePositionOf(const PositionWithAffinity& positionWithAffinity)
|
| +VisiblePosition createVisiblePosition(const PositionWithAffinity& positionWithAffinity)
|
| {
|
| - return visiblePositionOf(positionWithAffinity.position(), positionWithAffinity.affinity());
|
| + return createVisiblePosition(positionWithAffinity.position(), positionWithAffinity.affinity());
|
| }
|
|
|
| -VisiblePosition visiblePositionOf(const PositionInComposedTree& position, TextAffinity affinity)
|
| +VisiblePosition createVisiblePosition(const PositionInComposedTree& position, TextAffinity affinity)
|
| {
|
| - PositionInComposedTreeWithAffinity canonicalized = visiblePositionOfAlgorithm<EditingInComposedTreeStrategy>(position, affinity);
|
| + PositionInComposedTreeWithAffinity canonicalized = createVisiblePositionAlgorithm<EditingInComposedTreeStrategy>(position, affinity);
|
| return VisiblePosition::createWithoutCanonicalization(PositionWithAffinity(toPositionInDOMTree(canonicalized.position()), canonicalized.affinity()));
|
| }
|
|
|
|
|