Move static member functions next{Previous,Next}Offset() and uncheckedPreviousOffsetForBackwardDelet

Source/core/editing/Position.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2009 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 296 matching lines @@
     int offsetB = positionB.computeOffsetInContainerNode();
     return comparePositionsInComposedTree(containerA, offsetA, containerB, offsetB);
 }
 
 template <typename Strategy>
 int PositionAlgorithm<Strategy>::compareTo(const PositionAlgorithm<Strategy>& other) const
 {
     return comparePositions(*this, other);
 }
 
+// TODO(yosin) To avoid forward declaration, we should move implementation of
+// |uncheckedPreviousOffsetForBackwardDeletion()| here.
+static int uncheckedPreviousOffsetForBackwardDeletion(const Node*, int current);
+
 template <typename Strategy>
 PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::previous(PositionMoveType moveType) const
 {
     Node* node = anchorNode();
     if (!node)
         return PositionAlgorithm<Strategy>(*this);
 
     int offset = computeEditingOffset();
 
     if (offset > 0) {
@@ skipping 50 matching lines @@
         //   2) The new offset is a bogus offset like (<br>, 1), and there is no child.
         //      Going from 0 to 1 is correct.
         return editingPositionOf(node, (moveType == Character) ? uncheckedNextOffset(node, offset) : offset + 1);
     }
 
     if (ContainerNode* parent = Strategy::parent(*node))
         return editingPositionOf(parent, Strategy::index(*node) + 1);
     return PositionAlgorithm<Strategy>(*this);
 }
 
-template <typename Strategy>
-int PositionAlgorithm<Strategy>::uncheckedPreviousOffset(const Node* n, int current)
+int uncheckedPreviousOffset(const Node* n, int current)
 {
     return n->layoutObject() ? n->layoutObject()->previousOffset(current) : current - 1;
 }
 
-template <typename Strategy>
-int PositionAlgorithm<Strategy>::uncheckedPreviousOffsetForBackwardDeletion(const Node* n, int current)
+static int uncheckedPreviousOffsetForBackwardDeletion(const Node* n, int current)
 {
     return n->layoutObject() ? n->layoutObject()->previousOffsetForBackwardDeletion(current) : current - 1;
 }
 
-template <typename Strategy>
-int PositionAlgorithm<Strategy>::uncheckedNextOffset(const Node* n, int current)
+int uncheckedNextOffset(const Node* n, int current)
 {
     return n->layoutObject() ? n->layoutObject()->nextOffset(current) : current + 1;
 }
 
 template <typename Strategy>
 bool PositionAlgorithm<Strategy>::atFirstEditingPositionForNode() const
 {
     if (isNull())
         return true;
     // FIXME: Position before anchor shouldn't be considered as at the first editing position for node
@@ skipping 949 matching lines @@
 
 void showTree(const blink::Position* pos)
 {
     if (pos)
         pos->showTreeForThis();
     else
         fprintf(stderr, "Cannot showTree for (nil)\n");
 }
 
 #endif