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

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

Index: third_party/WebKit/Source/core/editing/GranularityStrategy.cpp
diff --git a/third_party/WebKit/Source/core/editing/GranularityStrategy.cpp b/third_party/WebKit/Source/core/editing/GranularityStrategy.cpp
index b5b5fcd9747eb41bddd86a776cd36e8a18f6524f..5efb29172ee8b20d6309e310da49782bad306727 100644
--- a/third_party/WebKit/Source/core/editing/GranularityStrategy.cpp
+++ b/third_party/WebKit/Source/core/editing/GranularityStrategy.cpp
@@ -71,7 +71,11 @@ VisibleSelection CharacterGranularityStrategy::updateExtent(
   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()
@@ -147,8 +151,11 @@ VisibleSelection DirectionGranularityStrategy::updateExtent(
   // 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;