Implementing directional selection strategy in Blink.

Source/core/editing/VisibleSelection.cpp

 /*
  * Copyright (C) 2004, 2005, 2006 Apple Computer, 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 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/editing/VisibleSelection.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Range.h"
-#include "core/editing/VisibleUnits.h"
 #include "core/editing/htmlediting.h"
 #include "core/editing/iterators/CharacterIterator.h"
 #include "core/layout/LayoutObject.h"
 #include "platform/geometry/LayoutPoint.h"
 #include "wtf/Assertions.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/unicode/CharacterNames.h"
 
 #ifndef NDEBUG
@@ skipping 299 matching lines @@
     else if (m_base.isNull()) {
         m_base = m_extent;
         m_baseIsFirst = true;
     } else if (m_extent.isNull()) {
         m_extent = m_base;
         m_baseIsFirst = true;
     } else
         m_baseIsFirst = comparePositions(m_base, m_extent) <= 0;
 }
 
-void VisibleSelection::setStartRespectingGranularity(TextGranularity granularity)
+void VisibleSelection::setStartRespectingGranularity(TextGranularity granularity, EWordSide wordSide)
 {
     m_start = m_baseIsFirst ? m_base : m_extent;
 
     switch (granularity) {
     case CharacterGranularity:
         // Don't do any expansion.
         break;
     case WordGranularity: {
-        // General case: Select the word the caret is positioned inside of, or at the start of (RightWordIfOnBoundary).
+        // General case: Select the word the caret is positioned inside of.
+        // If the caret is on the word boundary, select the word according to |wordSide|.
         // Edge case: If the caret is after the last word in a soft-wrapped line or the last word in
         // the document, select that last word (LeftWordIfOnBoundary).
         // Edge case: If the caret is after the last word in a paragraph, select from the the end of the
         // last word to the line break (also RightWordIfOnBoundary);
         VisiblePosition visibleStart = VisiblePosition(m_start, m_affinity);
-        EWordSide side = RightWordIfOnBoundary;
+        EWordSide side = wordSide;
         if (isEndOfEditableOrNonEditableContent(visibleStart) || (isEndOfLine(visibleStart) && !isStartOfLine(visibleStart) && !isEndOfParagraph(visibleStart)))
             side = LeftWordIfOnBoundary;
         m_start = startOfWord(visibleStart, side).deepEquivalent();
         break;
     }
     case SentenceGranularity: {
         m_start = startOfSentence(VisiblePosition(m_start, m_affinity)).deepEquivalent();
         break;
     }
     case LineGranularity: {
@@ skipping 19 matching lines @@
     case SentenceBoundary:
         m_start = startOfSentence(VisiblePosition(m_start, m_affinity)).deepEquivalent();
         break;
     }
 
     // Make sure we do not have a dangling start or end.
     if (m_start.isNull())
         m_start = m_end;
 }
 
-void VisibleSelection::setEndRespectingGranularity(TextGranularity granularity)
+void VisibleSelection::setEndRespectingGranularity(TextGranularity granularity, EWordSide wordSide)
 {
     m_end = m_baseIsFirst ? m_extent : m_base;
 
     switch (granularity) {
     case CharacterGranularity:
         // Don't do any expansion.
         break;
     case WordGranularity: {
-        // General case: Select the word the caret is positioned inside of, or at the start of (RightWordIfOnBoundary).
+        // General case: Select the word the caret is positioned inside of.
+        // If the caret is on the word boundary, select the word according to |wordSide|.
         // Edge case: If the caret is after the last word in a soft-wrapped line or the last word in
         // the document, select that last word (LeftWordIfOnBoundary).
         // Edge case: If the caret is after the last word in a paragraph, select from the the end of the
         // last word to the line break (also RightWordIfOnBoundary);
         VisiblePosition originalEnd(m_end, m_affinity);
-        EWordSide side = RightWordIfOnBoundary;
+        EWordSide side = wordSide;
         if (isEndOfEditableOrNonEditableContent(originalEnd) || (isEndOfLine(originalEnd) && !isStartOfLine(originalEnd) && !isEndOfParagraph(originalEnd)))
             side = LeftWordIfOnBoundary;
 
         VisiblePosition wordEnd(endOfWord(originalEnd, side));
         VisiblePosition end(wordEnd);
 
         if (isEndOfParagraph(originalEnd) && !isEmptyTableCell(m_start.deprecatedNode())) {
             // Select the paragraph break (the space from the end of a paragraph to the start of
             // the next one) to match TextEdit.
             end = wordEnd.next();
@@ skipping 475 matching lines @@
     sel.showTreeForThis();
 }
 
 void showTree(const blink::VisibleSelection* sel)
 {
     if (sel)
         sel->showTreeForThis();
 }
 
 #endif