Introduce firstEditablePositionAfterPositionInRoot()

Source/core/editing/EditingUtilities.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007 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 436 matching lines @@
     return previousVisuallyDistinctCandidateAlgorithm<EditingStrategy>(position);
 }
 
 PositionInComposedTree previousVisuallyDistinctCandidate(const PositionInComposedTree& position)
 {
     return previousVisuallyDistinctCandidateAlgorithm<EditingInComposedTreeStrategy>(position);
 }
 
 VisiblePosition firstEditableVisiblePositionAfterPositionInRoot(const Position& position, ContainerNode* highestRoot)
 {
+    return VisiblePosition(firstEditablePositionAfterPositionInRoot(position, highestRoot));
+}
+
+template <typename Strategy>
+PositionAlgorithm<Strategy> firstEditablePositionAfterPositionInRootAlgorithm(const PositionAlgorithm<Strategy>& position, Node* highestRoot)
+{
     // position falls before highestRoot.
-    if (comparePositions(position, firstPositionInNode(highestRoot)) == -1 && highestRoot->hasEditableStyle())
-        return VisiblePosition(firstPositionInNode(highestRoot));
+    if (position.compareTo(PositionAlgorithm<Strategy>::firstPositionInNode(highestRoot)) == -1 && highestRoot->hasEditableStyle())
+        return PositionAlgorithm<Strategy>::firstPositionInNode(highestRoot);
 
-    Position editablePosition = position;
+    PositionAlgorithm<Strategy> editablePosition = position;
 
     if (position.anchorNode()->treeScope() != highestRoot->treeScope()) {
         Node* shadowAncestor = highestRoot->treeScope().ancestorInThisScope(editablePosition.anchorNode());
         if (!shadowAncestor)
-            return VisiblePosition();
+            return PositionAlgorithm<Strategy>();
 
-        editablePosition = positionAfterNode(shadowAncestor);
+        editablePosition = PositionAlgorithm<Strategy>::afterNode(shadowAncestor);
     }
 
     while (editablePosition.anchorNode() && !isEditablePosition(editablePosition) && editablePosition.anchorNode()->isDescendantOf(highestRoot))
-        editablePosition = isAtomicNode(editablePosition.anchorNode()) ? positionInParentAfterNode(*editablePosition.anchorNode()) : nextVisuallyDistinctCandidate(editablePosition);
+        editablePosition = isAtomicNode(editablePosition.anchorNode()) ? PositionAlgorithm<Strategy>::inParentAfterNode(*editablePosition.anchorNode()) : nextVisuallyDistinctCandidate(editablePosition);
 
     if (editablePosition.anchorNode() && editablePosition.anchorNode() != highestRoot && !editablePosition.anchorNode()->isDescendantOf(highestRoot))
-        return VisiblePosition();
+        return PositionAlgorithm<Strategy>();
 
-    return VisiblePosition(editablePosition);
+    return editablePosition;
+}
+
+Position firstEditablePositionAfterPositionInRoot(const Position& position, Node* highestRoot)
+{
+    return firstEditablePositionAfterPositionInRootAlgorithm<EditingStrategy>(position, highestRoot);
+}
+
+PositionInComposedTree firstEditablePositionAfterPositionInRoot(const PositionInComposedTree& position, Node* highestRoot)
+{
+    return firstEditablePositionAfterPositionInRootAlgorithm<EditingInComposedTreeStrategy>(position, highestRoot);
 }
 
 VisiblePosition lastEditableVisiblePositionBeforePositionInRoot(const Position& position, ContainerNode* highestRoot)
 {
     return VisiblePosition(lastEditablePositionBeforePositionInRoot(position, highestRoot));
 }
 
 template <typename PositionType>
 PositionType lastEditablePositionBeforePositionInRootAlgorithm(const PositionType& position, Node* highestRoot)
 {
@@ skipping 1089 matching lines @@
     // if the selection starts just before a paragraph break, skip over it
     if (isEndOfParagraph(visiblePosition))
         return mostForwardCaretPosition(visiblePosition.next().deepEquivalent());
 
     // otherwise, make sure to be at the start of the first selected node,
     // instead of possibly at the end of the last node before the selection
     return mostForwardCaretPosition(visiblePosition.deepEquivalent());
 }
 
 } // namespace blink