Make SelectionController::setNonDirectionalSelectionIfNeeded() to take SelectionInFlatTree

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 377 matching lines @@
     basePosition = selection().computeVisibleSelectionInFlatTree().base();
   }
   const SelectionInFlatTree& appliedSelection = applySelectAll(
       basePosition, targetPosition.deepEquivalent(), mousePressNode,
       dragStartPos, target, hitTestResult.localPoint());
   SelectionInFlatTree::Builder builder(appliedSelection);
 
   if (selection().granularity() != CharacterGranularity)
     builder.setGranularity(selection().granularity());
 
-  setNonDirectionalSelectionIfNeeded(
-      createVisibleSelection(builder.build()), selection().granularity(),

[Xiaocheng, 2017/03/06 19:04:31]

Guess this canonicalization is important and shouldn't be removed.

-      AdjustEndpointsAtBidiBoundary, HandleVisibility::NotVisible);
+  setNonDirectionalSelectionIfNeeded(builder.build(), selection().granularity(),
+                                     AdjustEndpointsAtBidiBoundary,
+                                     HandleVisibility::NotVisible);
 }
 
 bool SelectionController::updateSelectionForMouseDownDispatchingSelectStart(
     Node* targetNode,
     const VisibleSelectionInFlatTree& selection,
     TextGranularity granularity,
     HandleVisibility handleVisibility) {
   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;
   }
 
-  setNonDirectionalSelectionIfNeeded(selection, granularity,
+  setNonDirectionalSelectionIfNeeded(selection.asSelection(), granularity,
                                      DoNotAdjustEndpoints, handleVisibility);
 
   return true;
 }
 
 bool SelectionController::selectClosestWordFromHitTestResult(
     const HitTestResult& result,
     AppendTrailingWhitespace appendTrailingWhitespace,
     SelectInputEventType selectInputEventType) {
   Node* innerNode = result.innerNode();
@@ skipping 188 matching lines @@
 
   if (extent.atRightBoundaryOfBidiRun() &&
       extent.isEquivalent(
           base.rightBoundaryOfBidiRun(extent.bidiLevelOnLeft()))) {
     visibleExtent = createVisiblePosition(
         toPositionInFlatTree(extent.positionAtRightBoundaryOfBiDiRun()));
     return;
   }
 }
 
-// TODO(yosin): We should make |setNonDirectionalSelectionIfNeeded()| to take
-// |SelectionInFlatTree| instead of |VisibleSelectionInFlatTree|.
+// TODO(yosin): We should take |granularity| and |handleVisibility| from
+// |newSelection|.
 void SelectionController::setNonDirectionalSelectionIfNeeded(
-    const VisibleSelectionInFlatTree& newSelection,
+    const SelectionInFlatTree& newSelection,
     TextGranularity granularity,
     EndPointsAdjustmentMode endpointsAdjustmentMode,
     HandleVisibility handleVisibility) {
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   const PositionInFlatTree& basePosition =
       m_originalBaseInFlatTree.deepEquivalent();
   const VisiblePositionInFlatTree& originalBase =
       basePosition.isConnected() ? createVisiblePosition(basePosition)
                                  : VisiblePositionInFlatTree();
   const VisiblePositionInFlatTree& base =
       originalBase.isNotNull() ? originalBase
                                : createVisiblePosition(newSelection.base());
   VisiblePositionInFlatTree newBase = base;
   const VisiblePositionInFlatTree& extent =
       createVisiblePosition(newSelection.extent());
   VisiblePositionInFlatTree newExtent = extent;
   if (endpointsAdjustmentMode == AdjustEndpointsAtBidiBoundary)
     adjustEndpointsAtBidiBoundary(newBase, newExtent);
 
-  SelectionInFlatTree::Builder builder(newSelection.asSelection());
+  SelectionInFlatTree::Builder builder(newSelection);
   if (newBase.deepEquivalent() != base.deepEquivalent() ||
       newExtent.deepEquivalent() != extent.deepEquivalent()) {
     m_originalBaseInFlatTree = base;
     setContext(&document());
     builder.setBaseAndExtent(newBase.deepEquivalent(),
                              newExtent.deepEquivalent());
   } else if (originalBase.isNotNull()) {
     if (selection().computeVisibleSelectionInFlatTree().base() ==
         newSelection.base()) {
       builder.setBaseAndExtent(originalBase.deepEquivalent(),
@@ skipping 411 matching lines @@
 
 bool isExtendingSelection(const MouseEventWithHitTestResults& event) {
   bool isMouseDownOnLinkOrImage =
       event.isOverLink() || event.hitTestResult().image();
   return (event.event().modifiers() & WebInputEvent::Modifiers::ShiftKey) !=
              0 &&
          !isMouseDownOnLinkOrImage;
 }
 
 }  // namespace blink