Move computeInlineBoxPosition() out from VisiblePosition

This patch moves |computeInlineBoxPosition()| out from |VisiblePosition| for
a preparation of moving |computeInlineBoxPosition()| out from |Position|
to make |Position| class simpler for improving code health.

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

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

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

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

@@ -528,9 +528,9 @@ TextDirection FrameSelection::directionOfSelection()
     VisiblePosition startPosition = m_selection.visibleStart();
     VisiblePosition endPosition = m_selection.visibleEnd();
     if (startPosition.isNotNull())
-        startBox = startPosition.computeInlineBoxPosition().inlineBox;
+        startBox = computeInlineBoxPosition(startPosition).inlineBox;
     if (endPosition.isNotNull())
-        endBox = endPosition.computeInlineBoxPosition().inlineBox;
+        endBox = computeInlineBoxPosition(endPosition).inlineBox;
     if (startBox && endBox && startBox->direction() == endBox->direction())
         return startBox->direction();
 

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

@@ -74,7 +74,7 @@ RenderedPosition::RenderedPosition(const VisiblePosition& position)
 {
     if (position.isNull())
         return;
-    InlineBoxPosition boxPosition = position.computeInlineBoxPosition();
+    InlineBoxPosition boxPosition = computeInlineBoxPosition(position);
     m_inlineBox = boxPosition.inlineBox;
     m_offset = boxPosition.offsetInBox;
     if (m_inlineBox)

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

@@ -110,11 +110,6 @@ public:
     // FIXME: This does not handle [table, 0] correctly.
     Element* rootEditableElement() const { return m_deepPosition.isNotNull() ? m_deepPosition.anchorNode()->rootEditableElement() : 0; }
 
-    InlineBoxPosition computeInlineBoxPosition() const
-    {
-        return m_deepPosition.computeInlineBoxPosition(m_affinity);
-    }
-
     // Rect is local to the returned layoutObject
     LayoutRect localCaretRect(LayoutObject*&) const;
     // Bounds of (possibly transformed) caret in absolute coords
@@ -142,6 +137,13 @@ private:
     EAffinity m_affinity;
 };
 
+// TODO(yosin) We should move |computeInlineBoxPosition()| to "VisibleUnits.h"
+// with |Position| version.
+inline InlineBoxPosition computeInlineBoxPosition(const VisiblePosition& position)
+{
+    return position.deepEquivalent().computeInlineBoxPosition(position.affinity());
+}
+
 EphemeralRange makeRange(const VisiblePosition&, const VisiblePosition&);
 
 CORE_EXPORT Position canonicalPositionOf(const Position&);

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

@@ -973,7 +973,7 @@ VisiblePosition previousLinePosition(const VisiblePosition &visiblePosition, Lay
         return VisiblePosition();
 
     RootInlineBox* root = 0;
-    InlineBox* box = visiblePosition.computeInlineBoxPosition().inlineBox;
+    InlineBox* box = computeInlineBoxPosition(visiblePosition).inlineBox;
     if (box) {
         root = box->root().prevRootBox();
         // We want to skip zero height boxes.
@@ -1026,7 +1026,7 @@ VisiblePosition nextLinePosition(const VisiblePosition &visiblePosition, LayoutU
         return VisiblePosition();
 
     RootInlineBox* root = 0;
-    InlineBox* box = visiblePosition.computeInlineBoxPosition().inlineBox;
+    InlineBox* box = computeInlineBoxPosition(visiblePosition).inlineBox;
     if (box) {
         root = box->root().nextRootBox();
         // We want to skip zero height boxes.