Move setNonDirectionalSelectionIfNeeded() to SelectionController from FrameSelection

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 205 matching lines @@
 
   if (extent.atRightBoundaryOfBidiRun() &&
       extent.isEquivalent(
           base.rightBoundaryOfBidiRun(extent.bidiLevelOnLeft()))) {
     visibleExtent = createVisiblePosition(fromPositionInDOMTree<Strategy>(
         extent.positionAtRightBoundaryOfBiDiRun()));
     return;
   }
 }
 
-void FrameSelection::setNonDirectionalSelectionIfNeeded(
+// TODO(yosin): We should move |setNonDirectionalSelectionIfNeeded()| to
+// "SelectionController.cpp"
+void SelectionController::setNonDirectionalSelectionIfNeeded(
     const VisibleSelectionInFlatTree& passedNewSelection,
     TextGranularity granularity,
     EndPointsAdjustmentMode endpointsAdjustmentMode) {
   VisibleSelectionInFlatTree newSelection = passedNewSelection;
   bool isDirectional = shouldAlwaysUseDirectionalSelection(m_frame) ||
                        newSelection.isDirectional();
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   document().updateStyleAndLayoutIgnorePendingStylesheets();
@@ skipping 12 matching lines @@
   VisiblePositionInFlatTree newExtent = extent;
   if (endpointsAdjustmentMode == AdjustEndpointsAtBidiBoundary)
     adjustEndpointsAtBidiBoundary(newBase, newExtent);
 
   if (newBase.deepEquivalent() != base.deepEquivalent() ||
       newExtent.deepEquivalent() != extent.deepEquivalent()) {
     m_originalBaseInFlatTree = base;
     newSelection.setBase(newBase);
     newSelection.setExtent(newExtent);
   } else if (originalBase.isNotNull()) {
-    if (visibleSelection<EditingInFlatTreeStrategy>().base() ==
+    if (selection().visibleSelection<EditingInFlatTreeStrategy>().base() ==
         newSelection.base())
       newSelection.setBase(originalBase);
     m_originalBaseInFlatTree = VisiblePositionInFlatTree();
   }
 
   // Adjusting base and extent will make newSelection always directional
   newSelection.setIsDirectional(isDirectional);
-  if (visibleSelection<EditingInFlatTreeStrategy>() == newSelection)
+  if (selection().visibleSelection<EditingInFlatTreeStrategy>() == newSelection)
     return;
 
-  const SetSelectionOptions options = CloseTyping | ClearTypingStyle;
-  setSelection(newSelection, options, CursorAlignOnScroll::IfNeeded,
-               granularity);
+  const FrameSelection::SetSelectionOptions options =
+      FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle;
+  selection().setSelection(newSelection, options, CursorAlignOnScroll::IfNeeded,
+                           granularity);
 }
 
 template <typename Strategy>
 void FrameSelection::setSelectionAlgorithm(
     const VisibleSelectionTemplate<Strategy>& newSelection,
     SetSelectionOptions options,
     CursorAlignOnScroll align,
     TextGranularity granularity) {
   DCHECK(isAvailable());
   DCHECK(newSelection.isValidFor(document()));
@@ skipping 523 matching lines @@
 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) {
   DCHECK_EQ(m_document, document);
   m_document = nullptr;
-  m_originalBaseInFlatTree = VisiblePositionInFlatTree();
   m_granularity = CharacterGranularity;
 
   LayoutViewItem view = m_frame->contentLayoutItem();
   if (!view.isNull())
     view.clearSelection();
 
   clearTypingStyle();
   m_selectionEditor->documentDetached(document);
   m_frameCaret->documentDetached();
+  m_frame->eventHandler().selectionController().documentDetached();

[Xiaocheng, 2016/10/24 03:53:11]

SelectionController::DocumentDetached doesn't seem to be quite relevant to
FrameSelection. I think we should move the call site somewhere else, say, to
Document::shutdown.

[yosin_UTC9, 2016/10/24 07:12:12]

Done.

 }
 
 LayoutBlock* FrameSelection::caretLayoutObject() const {
   DCHECK(selection().isValidFor(document()));
   if (!isCaret())
     return nullptr;
   return CaretBase::caretLayoutObject(selection().start().anchorNode());
 }
 
 IntRect FrameSelection::absoluteCaretBounds() {
@@ skipping 525 matching lines @@
   selection().showTreeForThis();
 }
 
 #endif
 
 DEFINE_TRACE(FrameSelection) {
   visitor->trace(m_document);
   visitor->trace(m_frame);
   visitor->trace(m_pendingSelection);
   visitor->trace(m_selectionEditor);
-  visitor->trace(m_originalBaseInFlatTree);
   visitor->trace(m_typingStyle);
   visitor->trace(m_frameCaret);
 }
 
 void FrameSelection::scheduleVisualUpdate() const {
   if (Page* page = m_frame->page())
     page->animator().scheduleVisualUpdate(m_frame->localFrameRoot());
 }
 
 bool FrameSelection::selectWordAroundPosition(const VisiblePosition& position) {
@@ skipping 103 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif