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

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 164 matching lines @@
     }
 
     if (!m_frame->editor().behavior().shouldConsiderSelectionAsDirectional()) {
       if (pos.isNotNull()) {
         // See <rdar://problem/3668157> REGRESSION (Mail): shift-click
         // deselects when selection was created right-to-left
         const PositionInFlatTree start = newSelection.start();
         const PositionInFlatTree end = newSelection.end();
         int distanceToStart = textDistance(start, pos);
         int distanceToEnd = textDistance(pos, end);
-        if (distanceToStart <= distanceToEnd)
-          newSelection = createVisibleSelection(end, pos);
-        else
-          newSelection = createVisibleSelection(start, pos);
+        newSelection = createVisibleSelection(
+            SelectionInFlatTree::Builder()
+                .collapse(distanceToStart <= distanceToEnd ? end : start)
+                .extend(pos)
+                .build());
       }
     } else {
       newSelection.setExtent(pos);
     }
 
     if (selection().granularity() != CharacterGranularity) {
       granularity = selection().granularity();
       newSelection.expandUsingGranularity(selection().granularity());
     }
   } else if (m_selectionState != SelectionState::ExtendedSelection) {
@@ skipping 237 matching lines @@
     const PositionInFlatTree& markerPosition =
         pos.deepEquivalent().parentAnchoredEquivalent();
     DocumentMarkerVector markers =
         innerNode->document().markers().markersInRange(
             EphemeralRange(toPositionInDOMTree(markerPosition)),
             DocumentMarker::MisspellingMarkers());
     if (markers.size() == 1) {
       Node* containerNode = markerPosition.computeContainerNode();
       const PositionInFlatTree start(containerNode, markers[0]->startOffset());
       const PositionInFlatTree end(containerNode, markers[0]->endOffset());
-      newSelection = createVisibleSelection(start, end);
+      newSelection = createVisibleSelection(
+          SelectionInFlatTree::Builder().collapse(start).extend(end).build());
     }
   }
 
   if (appendTrailingWhitespace == AppendTrailingWhitespace::ShouldAppend &&
       newSelection.isRange())
     newSelection.appendTrailingWhitespace();
 
   updateSelectionForMouseDownDispatchingSelectStart(
       innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection),
       WordGranularity);
@@ skipping 395 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