Prune createVisibleSelectionDeprecated from SelectionController

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  * Copyright (C) 2015 Google 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
@@ skipping 140 matching lines @@
     visiblePos = createVisiblePosition(
         PositionInFlatTree::firstPositionInOrBeforeNode(innerNode));
   PositionInFlatTree pos = visiblePos.deepEquivalent();
 
   VisibleSelectionInFlatTree newSelection =
       selection().visibleSelection<EditingInFlatTreeStrategy>();
   TextGranularity granularity = CharacterGranularity;
 
   if (extendSelection && !newSelection.isNone()) {
     const VisibleSelectionInFlatTree selectionInUserSelectAll(
-        expandSelectionToRespectUserSelectAll(
-            innerNode,
-            createVisibleSelectionDeprecated(createVisiblePosition(pos))));
+        expandSelectionToRespectUserSelectAll(innerNode,
+                                              createVisibleSelection(pos)));
     if (selectionInUserSelectAll.isRange()) {
       if (selectionInUserSelectAll.start().compareTo(newSelection.start()) < 0)
         pos = selectionInUserSelectAll.start();
       else if (newSelection.end().compareTo(selectionInUserSelectAll.end()) < 0)
         pos = selectionInUserSelectAll.end();
     }
 
     if (!m_frame->editor().behavior().shouldConsiderSelectionAsDirectional()) {
       if (pos.isNotNull()) {
         // See <rdar://problem/3668157> REGRESSION (Mail): shift-click
         // deselects when selection was created right-to-left
         const PositionInFlatTree start = newSelection.start();
         const PositionInFlatTree end = newSelection.end();
         int distanceToStart = textDistance(start, pos);
         int distanceToEnd = textDistance(pos, end);
         if (distanceToStart <= distanceToEnd)
-          newSelection = createVisibleSelectionDeprecated(end, pos);
+          newSelection = createVisibleSelection(end, pos);
         else
-          newSelection = createVisibleSelectionDeprecated(start, pos);
+          newSelection = createVisibleSelection(start, pos);
       }
     } else {
       newSelection.setExtent(pos);
     }
 
     if (selection().granularity() != CharacterGranularity) {
       granularity = selection().granularity();
       newSelection.expandUsingGranularity(selection().granularity());
     }
   } else if (m_selectionState != SelectionState::ExtendedSelection) {
     newSelection = expandSelectionToRespectUserSelectAll(
-        innerNode, createVisibleSelectionDeprecated(visiblePos));
+        innerNode, createVisibleSelection(visiblePos));
   }
 
   // Updating the selection is considered side-effect of the event and so it doesn't impact the handled state.
   updateSelectionForMouseDownDispatchingSelectStart(innerNode, newSelection,
                                                     granularity);
   return false;
 }
 
 void SelectionController::updateSelectionForMouseDrag(
     const HitTestResult& hitTestResult,
@@ skipping 42 matching lines @@
       dispatchSelectStart(target) != DispatchEventResult::NotCanceled)
     return;
 
   // TODO(yosin) We should check |mousePressNode|, |targetPosition|, and
   // |newSelection| are valid for |m_frame->document()|.
   // |dispatchSelectStart()| can change them by "selectstart" event handler.
 
   if (m_selectionState != SelectionState::ExtendedSelection) {
     // Always extend selection here because it's caused by a mouse drag
     m_selectionState = SelectionState::ExtendedSelection;
-    newSelection = createVisibleSelectionDeprecated(targetPosition);
+    newSelection = createVisibleSelection(targetPosition);
   }
 
   if (RuntimeEnabledFeatures::userSelectAllEnabled()) {
     // TODO(yosin) Should we use |Strategy::rootUserSelectAllForNode()|?
     Node* const rootUserSelectAllForMousePressNode =
         EditingInFlatTreeStrategy::rootUserSelectAllForNode(mousePressNode);
     Node* const rootUserSelectAllForTarget =
         EditingInFlatTreeStrategy::rootUserSelectAllForNode(target);
     if (rootUserSelectAllForMousePressNode &&
         rootUserSelectAllForMousePressNode == rootUserSelectAllForTarget) {
@@ skipping 96 matching lines @@
   // mid-point of the the image (which was intended for mouse-drag selection
   // and isn't desirable for touch).
   HitTestResult adjustedHitTestResult = result;
   if (selectInputEventType == SelectInputEventType::Touch && result.image())
     adjustedHitTestResult.setNodeAndPosition(result.innerNode(),
                                              LayoutPoint(0, 0));
 
   const VisiblePositionInFlatTree& pos =
       visiblePositionOfHitTestResult(adjustedHitTestResult);
   if (pos.isNotNull()) {
-    newSelection = createVisibleSelectionDeprecated(pos);
+    newSelection = createVisibleSelection(pos);
     newSelection.expandUsingGranularity(WordGranularity);
   }
 
   if (selectInputEventType == SelectInputEventType::Touch) {
     // If node doesn't have text except space, tab or line break, do not
     // select that 'empty' area.
     EphemeralRangeInFlatTree range(newSelection.start(), newSelection.end());
     const String& str =
         plainText(range, hasEditableStyle(*innerNode)
                              ? TextIteratorEmitsObjectReplacementCharacter
@@ skipping 32 matching lines @@
     const PositionInFlatTree& markerPosition =
         pos.deepEquivalent().parentAnchoredEquivalent();
     DocumentMarkerVector markers =
         innerNode->document().markers().markersInRange(
             EphemeralRange(toPositionInDOMTree(markerPosition)),
             DocumentMarker::MisspellingMarkers());
     if (markers.size() == 1) {
       Node* containerNode = markerPosition.computeContainerNode();
       const PositionInFlatTree start(containerNode, markers[0]->startOffset());
       const PositionInFlatTree end(containerNode, markers[0]->endOffset());
-      newSelection = createVisibleSelectionDeprecated(start, end);
+      newSelection = createVisibleSelection(start, end);
     }
   }
 
   if (appendTrailingWhitespace == AppendTrailingWhitespace::ShouldAppend &&
       newSelection.isRange())
     newSelection.appendTrailingWhitespace();
 
   updateSelectionForMouseDownDispatchingSelectStart(
       innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection),
       WordGranularity);
@@ skipping 101 matching lines @@
     return false;
 
   Node* innerNode = event.innerNode();
   if (!(innerNode && innerNode->layoutObject() && m_mouseDownMayStartSelect))
     return false;
 
   VisibleSelectionInFlatTree newSelection;
   const VisiblePositionInFlatTree& pos =
       visiblePositionOfHitTestResult(event.hitTestResult());
   if (pos.isNotNull()) {
-    newSelection = createVisibleSelectionDeprecated(pos);
+    newSelection = createVisibleSelection(pos);
     newSelection.expandUsingGranularity(ParagraphGranularity);
   }
 
   return updateSelectionForMouseDownDispatchingSelectStart(
       innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection),
       ParagraphGranularity);
 }
 
 void SelectionController::handleMousePressEvent(
     const MouseEventWithHitTestResults& event) {
@@ skipping 77 matching lines @@
     m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
     VisibleSelectionInFlatTree newSelection;
     Node* node = event.innerNode();
     bool caretBrowsing =
         m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
     if (node && node->layoutObject() &&
         (caretBrowsing || hasEditableStyle(*node))) {
       const VisiblePositionInFlatTree pos =
           visiblePositionOfHitTestResult(event.hitTestResult());
-      newSelection = createVisibleSelectionDeprecated(pos);
+      newSelection = createVisibleSelection(pos);
     }
 
     setSelectionIfNeeded(selection(), newSelection);
 
     handled = true;
   }
 
   selection().notifyLayoutObjectOfSelectionChange(UserTriggered);
 
   selection().selectFrameElementInParentIfFullySelected();
@@ skipping 119 matching lines @@
   IntPoint p = m_frame->view()->rootFrameToContents(mev.event().position());
   if (!selection().contains(p))
     return;
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   const VisiblePositionInFlatTree& visiblePos =
       visiblePositionOfHitTestResult(mev.hitTestResult());
-  VisibleSelectionInFlatTree newSelection =
-      createVisibleSelectionDeprecated(visiblePos);
+  VisibleSelectionInFlatTree newSelection = createVisibleSelection(visiblePos);
   selection().setSelection(newSelection);
 }
 
 void SelectionController::initializeSelectionState() {
   m_selectionState = SelectionState::HaveNotStartedSelection;
 }
 
 void SelectionController::setMouseDownMayStartSelect(bool mayStartSelect) {
   m_mouseDownMayStartSelect = mayStartSelect;
 }
@@ skipping 23 matching lines @@
   return event.event().altKey() && event.isOverLink();
 }
 
 bool isExtendingSelection(const MouseEventWithHitTestResults& event) {
   bool isMouseDownOnLinkOrImage =
       event.isOverLink() || event.hitTestResult().image();
   return event.event().shiftKey() && !isMouseDownOnLinkOrImage;
 }
 
 }  // namespace blink