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

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

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple 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 439 matching lines @@
     // selection to paint again.
     // TODO(yosin): We should paint changed area only rather than whole
     // selected range.
     clearLayoutTreeSelection = true;
   }
 
   if (clearLayoutTreeSelection)
     selection().start().document()->layoutViewItem().clearSelection();
 
   if (clearDOMTreeSelection)
-    setSelection(SelectionInDOMTree(), DoNotSetFocus);
+    setSelection(VisibleSelection(), DoNotSetFocus);
   m_frameCaret->setCaretRectNeedsUpdate();
 
   // TODO(yosin): We should move to call |TypingCommand::closeTyping()| to
   // |Editor| class.
   if (!document().isRunningExecCommand())
     TypingCommand::closeTyping(m_frame);
 }
 
 static Position updatePositionAfterAdoptingTextReplacement(
     const Position& position,
@@ skipping 219 matching lines @@
   if (userTriggered == UserTriggered)
     m_granularity = CharacterGranularity;
 
   return true;
 }
 
 void FrameSelection::clear() {
   m_granularity = CharacterGranularity;
   if (m_granularityStrategy)
     m_granularityStrategy->Clear();
-  setSelection(SelectionInDOMTree());
+  setSelection(VisibleSelection());
 }
 
 void FrameSelection::documentAttached(Document* document) {
   DCHECK(document);
   DCHECK(!m_document) << "FrameSelection is already attached to " << m_document;
   m_document = document;
   m_selectionEditor->documentAttached(document);
 }
 
 void FrameSelection::documentDetached(const Document& document) {
@@ skipping 133 matching lines @@
 
   SelectionInDOMTree::Builder builder;
   builder
       .setBaseAndExtentDeprecated(beforeOwnerElement.deepEquivalent(),
                                   afterOwnerElement.deepEquivalent())
       .setAffinity(beforeOwnerElement.affinity());
 
   // Focus on the parent frame, and then select from before this element to
   // after.
   VisibleSelection newSelection = createVisibleSelection(builder.build());
-  // TODO(yosin): We should call |FocusController::setFocusedFrame()| before
-  // |createVisibleSelection()|.
   page->focusController().setFocusedFrame(parent);
   // setFocusedFrame can dispatch synchronous focus/blur events.  The document
   // tree might be modified.
   if (newSelection.isNonOrphanedCaretOrRange())
     toLocalFrame(parent)->selection().setSelection(newSelection);
 }
 
 // Returns a shadow tree node for legacy shadow trees, a child of the
 // ShadowRoot node for new shadow trees, or 0 for non-shadow trees.
 static Node* nonBoundaryShadowTreeRootNode(const Position& position) {
@@ skipping 421 matching lines @@
 
 bool FrameSelection::selectWordAroundPosition(const VisiblePosition& position) {
   static const EWordSide wordSideList[2] = {RightWordIfOnBoundary,
                                             LeftWordIfOnBoundary};
   for (EWordSide wordSide : wordSideList) {
     VisiblePosition start = startOfWord(position, wordSide);
     VisiblePosition end = endOfWord(position, wordSide);
     String text =
         plainText(EphemeralRange(start.deepEquivalent(), end.deepEquivalent()));
     if (!text.isEmpty() && !isSeparator(text.characterStartingAt(0))) {
-      setSelection(SelectionInDOMTree::Builder()
-                       .collapse(start.toPositionWithAffinity())
-                       .extend(end.deepEquivalent())
-                       .build(),
-                   CloseTyping | ClearTypingStyle,
-                   CursorAlignOnScroll::IfNeeded, WordGranularity);
+      setSelection(
+          createVisibleSelection(SelectionInDOMTree::Builder()
+                                     .collapse(start.toPositionWithAffinity())
+                                     .extend(end.deepEquivalent())
+                                     .build()),
+          CloseTyping | ClearTypingStyle, CursorAlignOnScroll::IfNeeded,
+          WordGranularity);
       return true;
     }
   }
 
   return false;
 }
 
 GranularityStrategy* FrameSelection::granularityStrategy() {
   // We do lazy initalization for m_granularityStrategy, because if we
   // initialize it right in the constructor - the correct settings may not be
@@ skipping 89 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif