Get rid of createVisibleSelection() to take EphemeralRange

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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
@@ skipping 134 matching lines @@
   DCHECK(m_editor->m_preventRevealSelection);
   --m_editor->m_preventRevealSelection;
   if (!m_editor->m_preventRevealSelection) {
     m_editor->frame().selection().revealSelection(
         ScrollAlignment::alignToEdgeIfNeeded, RevealExtent);
   }
 }
 
 // When an event handler has moved the selection outside of a text control
 // we should use the target control's selection for this editing operation.
+// TODO(yosin): We should make |Editor::selectionForCommand()| to return
+// |SelectionInDOMTree| instead of |VisibleSelection|.
 VisibleSelection Editor::selectionForCommand(Event* event) {
   frame().selection().updateIfNeeded();
   VisibleSelection selection = frame().selection().selection();
   if (!event)
     return selection;
   // If the target is a text control, and the current selection is outside of
   // its shadow tree, then use the saved selection for that text control.
   HTMLTextFormControlElement* textFormControlOfSelectionStart =
       enclosingTextFormControl(selection.start());
   HTMLTextFormControlElement* textFromControlOfTarget =
       isHTMLTextFormControlElement(*event->target()->toNode())
           ? toHTMLTextFormControlElement(event->target()->toNode())
           : 0;
   if (textFromControlOfTarget &&
       (selection.start().isNull() ||
        textFromControlOfTarget != textFormControlOfSelectionStart)) {
     if (Range* range = textFromControlOfTarget->selection()) {
-      return createVisibleSelection(EphemeralRange(range),
-                                    TextAffinity::Downstream,
-                                    selection.isDirectional());
+      return createVisibleSelection(
+          SelectionInDOMTree::Builder()
+              .setBaseAndExtent(EphemeralRange(range))
+              .setIsDirectional(selection.isDirectional())
+              .build());
     }
   }
   return selection;
 }
 
 // Function considers Mac editing behavior a fallback when Page or Settings is
 // not available.
 EditingBehavior Editor::behavior() const {
   if (!frame().settings())
     return EditingBehavior(EditingMacBehavior);
@@ skipping 1089 matching lines @@
       isEndOfParagraph(caret) ? caret : nextPositionOf(caret);
   VisiblePosition previous = previousPositionOf(next);
   if (next.deepEquivalent() == previous.deepEquivalent())
     return;
   previous = previousPositionOf(previous);
   if (!inSameParagraph(next, previous))
     return;
   const EphemeralRange range = makeRange(previous, next);
   if (range.isNull())
     return;
-  VisibleSelection newSelection = createVisibleSelection(range);
+  VisibleSelection newSelection = createVisibleSelection(
+      SelectionInDOMTree::Builder().setBaseAndExtent(range).build());
 
   // Transpose the two characters.
   String text = plainText(range);
   if (text.length() != 2)
     return;
   String transposed = text.right(1) + text.left(1);
 
   // Select the two characters.
   if (newSelection != frame().selection().selection())
     frame().selection().setSelection(newSelection);
@@ skipping 117 matching lines @@
   // TODO(yosin) We should make |findRangeOfString()| to return
   // |EphemeralRange| rather than|Range| object.
   Range* resultRange = findRangeOfString(
       target, EphemeralRange(selection.start(), selection.end()),
       static_cast<FindOptions>(options | FindAPICall));
 
   if (!resultRange)
     return false;
 
   frame().selection().setSelection(
-      createVisibleSelection(EphemeralRange(resultRange)));
+      SelectionInDOMTree::Builder()
+          .setBaseAndExtent(EphemeralRange(resultRange))
+          .build());
   frame().selection().revealSelection();
   return true;
 }
 
 Range* Editor::findStringAndScrollToVisible(const String& target,
                                             Range* previousMatch,
                                             FindOptions options) {
   Range* nextMatch = findRangeOfString(
       target, EphemeralRangeInFlatTree(previousMatch), options);
   if (!nextMatch)
@@ skipping 208 matching lines @@
 }
 
 DEFINE_TRACE(Editor) {
   visitor->trace(m_frame);
   visitor->trace(m_lastEditCommand);
   visitor->trace(m_undoStack);
   visitor->trace(m_mark);
 }
 
 }  // namespace blink