Move setNonDirectionalSelectionIfNeeded() to SelectionController from FrameSelection

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:
@@ skipping 43 matching lines @@
 
 SelectionController::SelectionController(LocalFrame& frame)
     : m_frame(&frame),
       m_mouseDownMayStartSelect(false),
       m_mouseDownWasSingleClickInSelection(false),
       m_mouseDownAllowsMultiClick(false),
       m_selectionState(SelectionState::HaveNotStartedSelection) {}
 
 DEFINE_TRACE(SelectionController) {
   visitor->trace(m_frame);
+  visitor->trace(m_originalBaseInFlatTree);
 }
 
 namespace {
 
 void setSelectionIfNeeded(FrameSelection& selection,
                           const VisibleSelectionInFlatTree& newSelection) {
   if (selection.visibleSelection<EditingInFlatTreeStrategy>() == newSelection)
     return;
   selection.setSelection(newSelection);
 }
@@ skipping 42 matching lines @@
 
 VisiblePositionInFlatTree visiblePositionOfHitTestResult(
     const HitTestResult& hitTestResult) {
   return createVisiblePosition(fromPositionInDOMTree<EditingInFlatTreeStrategy>(
       hitTestResult.innerNode()->layoutObject()->positionForPoint(
           hitTestResult.localPoint())));
 }
 
 }  // namespace
 
+Document& SelectionController::document() const {
+  DCHECK(m_frame->document());
+  return *m_frame->document();
+}
+
+void SelectionController::documentDetached() {
+  m_originalBaseInFlatTree = VisiblePositionInFlatTree();
+}
+
 bool SelectionController::handleMousePressEventSingleClick(
     const MouseEventWithHitTestResults& event) {
   TRACE_EVENT0("blink",
                "SelectionController::handleMousePressEventSingleClick");
 
   DCHECK(!m_frame->document()->needsLayoutTreeUpdate());
   Node* innerNode = event.innerNode();
   if (!(innerNode && innerNode->layoutObject() && m_mouseDownMayStartSelect))
     return false;
 
@@ skipping 189 matching lines @@
       else
         newSelection.setExtent(targetPosition);
     }
   } else {
     newSelection.setExtent(targetPosition);
   }
 
   if (selection().granularity() != CharacterGranularity)
     newSelection.expandUsingGranularity(selection().granularity());
 
-  selection().setNonDirectionalSelectionIfNeeded(
-      newSelection, selection().granularity(),
-      FrameSelection::AdjustEndpointsAtBidiBoundary);
+  setNonDirectionalSelectionIfNeeded(newSelection, selection().granularity(),
+                                     AdjustEndpointsAtBidiBoundary);
 }
 
 bool SelectionController::updateSelectionForMouseDownDispatchingSelectStart(
     Node* targetNode,
     const VisibleSelectionInFlatTree& selection,
     TextGranularity granularity) {
   if (targetNode && targetNode->layoutObject() &&
       !targetNode->layoutObject()->isSelectable())
     return false;
 
   if (dispatchSelectStart(targetNode) != DispatchEventResult::NotCanceled)
     return false;
 
   // |dispatchSelectStart()| can change document hosted by |m_frame|.
   if (!this->selection().isAvailable())
     return false;
 
   if (!selection.isValidFor(this->selection().document()))
     return false;
 
   if (selection.isRange()) {
     m_selectionState = SelectionState::ExtendedSelection;
   } else {
     granularity = CharacterGranularity;
     m_selectionState = SelectionState::PlacedCaret;
   }
 
-  this->selection().setNonDirectionalSelectionIfNeeded(selection, granularity);
+  setNonDirectionalSelectionIfNeeded(selection, granularity,
+                                     DoNotAdjustEndpoints);
 
   return true;
 }
 
 void SelectionController::selectClosestWordFromHitTestResult(
     const HitTestResult& result,
     AppendTrailingWhitespace appendTrailingWhitespace,
     SelectInputEventType selectInputEventType) {
   Node* innerNode = result.innerNode();
   VisibleSelectionInFlatTree newSelection;
@@ skipping 479 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