Get rid of FrameSelection::setSelection() taking VisibleSelection

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 289 matching lines @@
   builder.setAffinity(newSelection.affinity())
       .setBaseAndExtent(toPositionInDOMTree(newSelection.base()),
                         toPositionInDOMTree(newSelection.extent()))
       .setGranularity(newSelection.granularity())
       .setIsDirectional(newSelection.isDirectional())
       .setIsHandleVisible(newSelection.isHandleVisible())
       .setHasTrailingWhitespace(newSelection.hasTrailingWhitespace());
   return setSelection(builder.build(), options, align, granularity);
 }
 
-void FrameSelection::setSelection(const VisibleSelection& newSelection,
-                                  HandleVisibility handleVisibility,
-                                  SetSelectionOptions options,
-                                  CursorAlignOnScroll align,
-                                  TextGranularity granularity) {
-  setSelection(
-      SelectionInDOMTree::Builder(newSelection.asSelection())
-          .setIsHandleVisible(handleVisibility == HandleVisibility::Visible)
-          .build(),
-      options, align, granularity);
-}
-
 void FrameSelection::nodeChildrenWillBeRemoved(ContainerNode& container) {
   if (!container.inActiveDocument())
     return;
   // TODO(yosin): We should move to call |TypingCommand::closeTyping()| to
   // |Editor| class.
   if (!document().isRunningExecCommand())
     TypingCommand::closeTyping(m_frame);
 }
 
 void FrameSelection::nodeWillBeRemoved(Node& node) {
@@ skipping 77 matching lines @@
 bool FrameSelection::modify(EAlteration alter,
                             unsigned verticalDistance,
                             VerticalDirection direction) {
   SelectionModifier selectionModifier(
       *frame(), computeVisibleSelectionInDOMTreeDeprecated());
   if (!selectionModifier.modifyWithPageGranularity(alter, verticalDistance,
                                                    direction)) {
     return false;
   }
 
-  setSelection(selectionModifier.selection(), HandleVisibility::NotVisible,
+  setSelection(selectionModifier.selection().asSelection(),
                CloseTyping | ClearTypingStyle | UserTriggered,
                alter == AlterationMove ? CursorAlignOnScroll::Always
                                        : CursorAlignOnScroll::IfNeeded);
 
   m_granularity = CharacterGranularity;
 
   return true;
 }
 
 void FrameSelection::clear() {
@@ skipping 163 matching lines @@
 
   // 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);
+    toLocalFrame(parent)->selection().setSelection(newSelection.asSelection());
 }
 
 // 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) {
   return position.anchorNode() && !position.anchorNode()->isShadowRoot()
              ? position.anchorNode()->nonBoundaryShadowTreeRootNode()
              : nullptr;
 }
 
@@ skipping 492 matching lines @@
     m_granularityStrategy = WTF::makeUnique<CharacterGranularityStrategy>();
   return m_granularityStrategy.get();
 }
 
 void FrameSelection::moveRangeSelectionExtent(const IntPoint& contentsPoint) {
   if (computeVisibleSelectionInDOMTreeDeprecated().isNone())
     return;
 
   VisibleSelection newSelection =
       granularityStrategy()->updateExtent(contentsPoint, m_frame);
-  setSelection(newSelection, HandleVisibility::Visible,
+  setSelection(SelectionInDOMTree::Builder(newSelection.asSelection())
+                   .setIsHandleVisible(true)
+                   .build(),
                FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle |
                    FrameSelection::DoNotClearStrategy | UserTriggered,
                CursorAlignOnScroll::IfNeeded, CharacterGranularity);
 }
 
 // TODO(yosin): We should make |FrameSelection::moveRangeSelection()| to take
 // two |IntPoint| instead of two |VisiblePosition| like
 // |moveRangeSelectionExtent()|.
 void FrameSelection::moveRangeSelection(const VisiblePosition& basePosition,
                                         const VisiblePosition& extentPosition,
@@ skipping 48 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif