Get rid of a redundant function Position::deprecatedEditingOffset()

This patch gets rid of a |Position::deprecatedEditingOffset()| by replacing
them to |computeEditingOffset()|, since |deprecatedEditingOffset()| is just
calling a |computeEditingOffset()| to simplify code for improving code health.

BUG=513114
TEST=n/a; no behavior changes

Review URL: https://codereview.chromium.org/1300813002

git-svn-id: svn://svn.chromium.org/blink/trunk@200779 bbb929c8-8fbe-4397-9dbb-9b2b20218538

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

@@ -204,14 +204,6 @@ int PositionAlgorithm<Strategy>::computeEditingOffset() const
     return m_offset;
 }
 
-// TODO(yosin) We should replace all usage of |deprecatedEditingOffset()| by
-// |computeEditingOffset()|.
-template <typename Strategy>
-int PositionAlgorithm<Strategy>::deprecatedEditingOffset() const
-{
-    return computeEditingOffset();
-}
-
 template <typename Strategy>
 Node* PositionAlgorithm<Strategy>::computeNodeBeforePosition() const
 {
@@ -328,7 +320,7 @@ PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::previous(PositionMoveTy
     if (!node)
         return PositionAlgorithm<Strategy>(*this);
 
-    int offset = deprecatedEditingOffset();
+    int offset = computeEditingOffset();
 
     if (offset > 0) {
         if (editingIgnoresContent(node))
@@ -370,7 +362,7 @@ PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::next(PositionMoveType m
     if (!node)
         return PositionAlgorithm<Strategy>(*this);
 
-    int offset = deprecatedEditingOffset();
+    int offset = computeEditingOffset();
 
     if (Node* child = Strategy::childAt(*node, offset))
         return firstPositionInOrBeforeNode(child);
@@ -1023,7 +1015,7 @@ template <typename Strategy>
 InlineBoxPosition PositionAlgorithm<Strategy>::computeInlineBoxPosition(EAffinity affinity, TextDirection primaryDirection) const
 {
     InlineBox* inlineBox = nullptr;
-    int caretOffset = deprecatedEditingOffset();
+    int caretOffset = computeEditingOffset();
     LayoutObject* layoutObject = m_anchorNode->isShadowRoot() ? toShadowRoot(m_anchorNode)->host()->layoutObject() : m_anchorNode->layoutObject();
 
     if (!layoutObject->isText()) {

third_party/WebKit/Source/core/editing/Position.h

@@ -137,9 +137,6 @@ public:
     // anchor node.
     int computeEditingOffset() const;
 
-    // New code should not use this function.
-    int deprecatedEditingOffset() const;
-
     // These are convenience methods which are smart about whether the position is neighbor anchored or parent anchored
     Node* computeNodeBeforePosition() const;
     Node* computeNodeAfterPosition() const;

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

@@ -37,7 +37,7 @@ PositionIteratorAlgorithm<Strategy>::PositionIteratorAlgorithm(Node* anchorNode,
 }
 template <typename Strategy>
 PositionIteratorAlgorithm<Strategy>::PositionIteratorAlgorithm(const PositionAlgorithm<Strategy>& pos)
-    : PositionIteratorAlgorithm(pos.anchorNode(), pos.deprecatedEditingOffset())
+    : PositionIteratorAlgorithm(pos.anchorNode(), pos.computeEditingOffset())
 {
 }
 

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

@@ -1541,7 +1541,7 @@ bool rendersInDifferentPosition(const Position& position1, const Position& posit
         if (isHTMLBRElement(*position1.anchorNode()))
             return false;
 
-        if (position1.deprecatedEditingOffset() == position2.deprecatedEditingOffset())
+        if (position1.computeEditingOffset() == position2.computeEditingOffset())
             return false;
 
         if (!position1.anchorNode()->isTextNode() && !position2.anchorNode()->isTextNode())

third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp

@@ -86,8 +86,8 @@ SimplifiedBackwardsTextIteratorAlgorithm<Strategy>::SimplifiedBackwardsTextItera
     if (!startNode)
         return;
     Node* endNode = end.anchorNode();
-    int startOffset = start.deprecatedEditingOffset();
-    int endOffset = end.deprecatedEditingOffset();
+    int startOffset = start.computeEditingOffset();
+    int endOffset = end.computeEditingOffset();
 
     init(startNode, endNode, startOffset, endOffset);
 }