Revert of Utilize FrameSelection::setSelection() taking SelectionInDOMTree/SelectionInFlatTree

third_party/WebKit/Source/core/editing/InputMethodController.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 159 matching lines @@
   m_compositionRange = nullptr;
 }
 
 void InputMethodController::selectComposition() const {
   const EphemeralRange range = compositionEphemeralRange();
   if (range.isNull())
     return;
 
   // The composition can start inside a composed character sequence, so we have
   // to override checks. See <http://bugs.webkit.org/show_bug.cgi?id=15781>
-  frame().selection().setSelection(
-      SelectionInDOMTree::Builder().setBaseAndExtent(range).build(), 0);
+  VisibleSelection selection;
+  selection.setWithoutValidation(range.startPosition(), range.endPosition());
+  frame().selection().setSelection(selection, 0);
 }
 
 bool InputMethodController::finishComposingText(
     ConfirmCompositionBehavior confirmBehavior) {
   if (!hasComposition())
     return false;
 
   if (confirmBehavior == KeepSelection) {
     PlainTextRange oldOffsets = getSelectionOffsets();
     Editor::RevealSelectionScope revealSelectionScope(&editor());
@@ skipping 278 matching lines @@
 
   if (inserting || deleting) {
     // Select the text to be deleted.
     const size_t compositionStart =
         PlainTextRange::create(*editable, compositionEphemeralRange()).start();
     const size_t deletionStart = compositionStart + commonPrefixLength;
     const size_t deletionEnd =
         compositionStart + composing.length() - commonSuffixLength;
     const EphemeralRange& deletionRange =
         PlainTextRange(deletionStart, deletionEnd).createRange(*editable);
+    VisibleSelection selection;
+    selection.setWithoutValidation(deletionRange.startPosition(),
+                                   deletionRange.endPosition());
     Document* const currentDocument = frame().document();
-    frame().selection().setSelection(
-        SelectionInDOMTree::Builder().setBaseAndExtent(deletionRange).build(),
-        0);
+    frame().selection().setSelection(selection, 0);
     clear();
 
     // FrameSeleciton::setSelection() can change document associate to |frame|.
     if (currentDocument != frame().document())
       return;
     if (!currentDocument->focusedElement())
       return;
 
     // Insert the incremental text.
     const size_t insertionLength =
@@ skipping 660 matching lines @@
 
   return WebTextInputTypeNone;
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->trace(m_frame);
   visitor->trace(m_compositionRange);
 }
 
 }  // namespace blink