Get rid of flat tree version of createVisibleSelection() taking two VisiblePosition

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/editing/GranularityStrategy.h"
 
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/FrameSelection.h"
 
 namespace blink {
@@ skipping 53 matching lines @@
 
 VisibleSelection CharacterGranularityStrategy::updateExtent(
     const IntPoint& extentPoint,
     LocalFrame* frame) {
   const VisiblePosition& extentPosition =
       visiblePositionForContentsPoint(extentPoint, frame);
   const VisibleSelection& selection = frame->selection().selection();
   if (selection.visibleBase().deepEquivalent() ==
       extentPosition.deepEquivalent())
     return selection;
-  return createVisibleSelection(selection.visibleBase(), extentPosition);
+  return createVisibleSelection(
+      SelectionInDOMTree::Builder()
+          .collapse(selection.visibleBase().toPositionWithAffinity())

[Xiaocheng, 2016/10/21 11:18:36]

We should use
collapse(selection.base()).setAffinity(selection.affinity()).extent(...)...
to reduce the usage of VisiblePosition.

[yosin_UTC9, 2016/10/24 06:19:44]

Good catch!
Done

+          .extend(extentPosition.deepEquivalent())
+          .build());
 }
 
 DirectionGranularityStrategy::DirectionGranularityStrategy()
     : m_state(StrategyState::Cleared),
       m_granularity(CharacterGranularity),
       m_offset(0) {}
 
 DirectionGranularityStrategy::~DirectionGranularityStrategy() {}
 
 SelectionStrategy DirectionGranularityStrategy::GetType() const {
@@ skipping 55 matching lines @@
   if (newOffsetExtentPosition.deepEquivalent() == base.deepEquivalent())
     return selection;
 
   // The direction granularity strategy, particularly the "offset" feature
   // doesn't work with non-horizontal text (e.g. when the text is rotated).
   // So revert to the behavior equivalent to the character granularity
   // strategy if we detect that the text's baseline coordinate changed
   // without a line change.
   if (verticalChange &&
       inSameLine(newOffsetExtentPosition, oldOffsetExtentPosition)) {
-    return createVisibleSelection(selection.visibleBase(),
-                                  newOffsetExtentPosition);
+    return createVisibleSelection(
+        SelectionInDOMTree::Builder()
+            .collapse(selection.visibleBase().toPositionWithAffinity())

[Xiaocheng, 2016/10/21 11:18:36]

We should use
collapse(selection.base()).setAffinity(selection.affinity()).extent(...)...
to reduce the usage of VisiblePosition.

[yosin_UTC9, 2016/10/24 06:19:44]

Good catch!
Done.

+            .extend(newOffsetExtentPosition.deepEquivalent())
+            .build());
   }
 
   int oldExtentBaseOrder = selection.isBaseFirst() ? 1 : -1;
 
   int newExtentBaseOrder;
   bool thisMoveShrunkSelection;
   if (newOffsetExtentPosition.deepEquivalent() ==
       oldOffsetExtentPosition.deepEquivalent()) {
     if (m_granularity == CharacterGranularity)
       return selection;
@@ skipping 97 matching lines @@
                                       : StrategyState::Expanding;
 
   m_diffExtentPointFromExtentPosition =
       extentPoint + IntSize(m_offset, 0) - positionLocation(newSelectionExtent);
   VisibleSelection newSelection = selection;
   newSelection.setExtent(newSelectionExtent);
   return newSelection;
 }
 
 }  // namespace blink