Introduce isRenderedCharacter(Position) function

This patch introduces |isRenderedCharacter(Position)()| as replacement of
|PositionAlgorithm<Strategy>::isRenderedCharacter()| to simplify source code
for improving code health, since |isRenderedCharacter()| is used only for
positions in DOM tree, thus we don't need to have composed tree version.

This patch is a part of |Position| class cleanup to reduce |LayoutObject|
dependency.


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

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

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

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

@@ -931,20 +931,19 @@ bool PositionAlgorithm<Strategy>::inRenderedText() const
     return false;
 }
 
-template <typename Strategy>
-bool PositionAlgorithm<Strategy>::isRenderedCharacter() const
+bool isRenderedCharacter(const Position& position)
 {
-    if (isNull())
+    if (position.isNull())
         return false;
-    ASSERT(isOffsetInAnchor());
-    if (!anchorNode()->isTextNode())
+    ASSERT(position.isOffsetInAnchor());
+    if (!position.anchorNode()->isTextNode())
         return false;
 
-    LayoutObject* layoutObject = anchorNode()->layoutObject();
+    LayoutObject* layoutObject = position.anchorNode()->layoutObject();
     if (!layoutObject)
         return false;
 
-    return toLayoutText(layoutObject)->isRenderedCharacter(offsetInContainerNode());
+    return toLayoutText(layoutObject)->isRenderedCharacter(position.offsetInContainerNode());
 }
 
 template <typename Strategy>

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

@@ -200,7 +200,6 @@ public:
 
     bool isCandidate() const;
     bool inRenderedText() const;
-    bool isRenderedCharacter() const;
 
     InlineBoxPosition computeInlineBoxPosition(EAffinity) const;
     InlineBoxPosition computeInlineBoxPosition(EAffinity, TextDirection primaryDirection) const;
@@ -255,6 +254,12 @@ extern template class CORE_EXTERN_TEMPLATE_EXPORT PositionAlgorithm<EditingInCom
 using Position = PositionAlgorithm<EditingStrategy>;
 using PositionInComposedTree = PositionAlgorithm<EditingInComposedTreeStrategy>;
 
+// TODO(yosin) |isRenderedCharacter()| should be removed, and we should use
+// |VisiblePosition::characterAfter()| and |VisiblePosition::characterBefore()|.
+// TODO(yosin) We should move |isRenderedCharacter()| to "VisibleUnits.cpp",
+// since it is used only in "editing/commands/"
+CORE_EXPORT bool isRenderedCharacter(const Position&);
+
 template <typename Strategy>
 bool operator==(const PositionAlgorithm<Strategy>& a, const PositionAlgorithm<Strategy>& b)
 {

third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp

@@ -570,13 +570,15 @@ void DeleteSelectionCommand::handleGeneralDelete()
 void DeleteSelectionCommand::fixupWhitespace()
 {
     document().updateLayoutIgnorePendingStylesheets();
-    // FIXME: isRenderedCharacter should be removed, and we should use VisiblePosition::characterAfter and VisiblePosition::characterBefore
-    if (m_leadingWhitespace.isNotNull() && !m_leadingWhitespace.isRenderedCharacter() && m_leadingWhitespace.anchorNode()->isTextNode()) {
+    // TODO(yosin) |isRenderedCharacter()| should be removed, and we should use
+    // |VisiblePosition::characterAfter()| and
+    // |VisiblePosition::characterBefore()|
+    if (m_leadingWhitespace.isNotNull() && !isRenderedCharacter(m_leadingWhitespace) && m_leadingWhitespace.anchorNode()->isTextNode()) {
         Text* textNode = toText(m_leadingWhitespace.anchorNode());
         ASSERT(!textNode->layoutObject() || textNode->layoutObject()->style()->collapseWhiteSpace());
         replaceTextInNodePreservingMarkers(textNode, m_leadingWhitespace.computeOffsetInContainerNode(), 1, nonBreakingSpaceString());
     }
-    if (m_trailingWhitespace.isNotNull() && !m_trailingWhitespace.isRenderedCharacter() && m_trailingWhitespace.anchorNode()->isTextNode()) {
+    if (m_trailingWhitespace.isNotNull() && !isRenderedCharacter(m_trailingWhitespace) && m_trailingWhitespace.anchorNode()->isTextNode()) {
         Text* textNode = toText(m_trailingWhitespace.anchorNode());
         ASSERT(!textNode->layoutObject() || textNode->layoutObject()->style()->collapseWhiteSpace());
         replaceTextInNodePreservingMarkers(textNode, m_trailingWhitespace.computeOffsetInContainerNode(), 1, nonBreakingSpaceString());

third_party/WebKit/Source/core/editing/commands/InsertLineBreakCommand.cpp

@@ -123,7 +123,9 @@ void InsertLineBreakCommand::doApply()
 
         // Handle whitespace that occurs after the split
         document().updateLayoutIgnorePendingStylesheets();
-        if (!endingPosition.isRenderedCharacter()) {
+        // TODO(yosin) |isRenderedCharacter()| should be removed, and we should
+        // use |VisiblePosition::characterAfter()|.
+        if (!isRenderedCharacter(endingPosition)) {
             Position positionBeforeTextNode(positionInParentBeforeNode(*textNode));
             // Clear out all whitespace and insert one non-breaking space
             deleteInsignificantTextDownstream(endingPosition);

third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp

@@ -417,7 +417,9 @@ void InsertParagraphSeparatorCommand::doApply()
     // Handle whitespace that occurs after the split
     if (positionAfterSplit.isNotNull()) {
         document().updateLayoutIgnorePendingStylesheets();
-        if (!positionAfterSplit.isRenderedCharacter()) {
+        // TODO(yosin) |isRenderedCharacter()| should be removed, and we should
+        // use |VisiblePosition::characterAfter()|.
+        if (!isRenderedCharacter(positionAfterSplit)) {
             // Clear out all whitespace and insert one non-breaking space
             ASSERT(!positionAfterSplit.computeContainerNode()->layoutObject() || positionAfterSplit.computeContainerNode()->layoutObject()->style()->collapseWhiteSpace());
             deleteInsignificantTextDownstream(positionAfterSplit);