Get rid of VisibleSelection::expandUsingGranularity()

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 178 matching lines @@
         newSelection = createVisibleSelection(
             SelectionInFlatTree::Builder()
                 .collapse(distanceToStart <= distanceToEnd ? end : start)
                 .extend(pos)
                 .build());
       }
     } else {
       newSelection.setExtent(pos);
     }
 
+    // TODO(yosin): We should have |newBase| and |newExtent| instead of
+    // |newSelection|.
     if (selection().granularity() != CharacterGranularity) {
       granularity = selection().granularity();
-      newSelection.expandUsingGranularity(selection().granularity());
+      newSelection = createVisibleSelection(
+          SelectionInFlatTree::Builder()
+              .setBaseAndExtent(newSelection.base(), newSelection.extent())
+              .setGranularity(granularity)
+              .build());
     }
   } else if (m_selectionState != SelectionState::ExtendedSelection) {
     if (visiblePos.isNull()) {
       newSelection = VisibleSelectionInFlatTree();
     } else {
       SelectionInFlatTree::Builder builder;
       builder.collapse(visiblePos.toPositionWithAffinity());
       newSelection = expandSelectionToRespectUserSelectAll(
           innerNode, createVisibleSelection(builder.build()));
     }
@@ skipping 114 matching lines @@
         newSelection.setExtent(mostForwardCaretPosition(
             PositionInFlatTree::afterNode(rootUserSelectAllForTarget),
             CanCrossEditingBoundary));
       else
         newSelection.setExtent(targetPosition);
     }
   } else {
     newSelection.setExtent(targetPosition);
   }
 
-  if (selection().granularity() != CharacterGranularity)
-    newSelection.expandUsingGranularity(selection().granularity());
+  // TODO(yosin): We should have |newBase| and |newExtent| instead of
+  // |newSelection|.
+  if (selection().granularity() != CharacterGranularity) {
+    newSelection = createVisibleSelection(
+        SelectionInFlatTree::Builder()
+            .setBaseAndExtent(newSelection.base(), newSelection.extent())
+            .setGranularity(selection().granularity())
+            .build());
+  }
 
   setNonDirectionalSelectionIfNeeded(newSelection, selection().granularity(),
                                      AdjustEndpointsAtBidiBoundary);
 }
 
 bool SelectionController::updateSelectionForMouseDownDispatchingSelectStart(
     Node* targetNode,
     const VisibleSelectionInFlatTree& selection,
     TextGranularity granularity) {
   if (targetNode && targetNode->layoutObject() &&
@@ skipping 38 matching lines @@
   // mid-point of the the image (which was intended for mouse-drag selection
   // and isn't desirable for touch).
   HitTestResult adjustedHitTestResult = result;
   if (selectInputEventType == SelectInputEventType::Touch && result.image())
     adjustedHitTestResult.setNodeAndPosition(result.innerNode(),
                                              LayoutPoint(0, 0));
 
   const VisiblePositionInFlatTree& pos =
       visiblePositionOfHitTestResult(adjustedHitTestResult);
   if (pos.isNotNull()) {
-    SelectionInFlatTree::Builder builder;
-    builder.collapse(pos.toPositionWithAffinity());
-    newSelection = createVisibleSelection(builder.build());
-    newSelection.expandUsingGranularity(WordGranularity);
+    newSelection =
+        createVisibleSelection(SelectionInFlatTree::Builder()
+                                   .collapse(pos.toPositionWithAffinity())
+                                   .setGranularity(WordGranularity)
+                                   .build());
   }
 
   if (selectInputEventType == SelectInputEventType::Touch) {
     // If node doesn't have text except space, tab or line break, do not
     // select that 'empty' area.
     EphemeralRangeInFlatTree range(newSelection.start(), newSelection.end());
     const String& str =
         plainText(range, hasEditableStyle(*innerNode)
                              ? TextIteratorEmitsObjectReplacementCharacter
                              : TextIteratorDefaultBehavior);
@@ skipping 258 matching lines @@
     return false;
 
   Node* innerNode = event.innerNode();
   if (!(innerNode && innerNode->layoutObject() && m_mouseDownMayStartSelect))
     return false;
 
   VisibleSelectionInFlatTree newSelection;
   const VisiblePositionInFlatTree& pos =
       visiblePositionOfHitTestResult(event.hitTestResult());
   if (pos.isNotNull()) {
-    SelectionInFlatTree::Builder builder;
-    builder.collapse(pos.toPositionWithAffinity());
-    newSelection = createVisibleSelection(builder.build());
-    newSelection.expandUsingGranularity(ParagraphGranularity);
+    newSelection =
+        createVisibleSelection(SelectionInFlatTree::Builder()
+                                   .collapse(pos.toPositionWithAffinity())
+                                   .setGranularity(ParagraphGranularity)
+                                   .build());
   }
 
   return updateSelectionForMouseDownDispatchingSelectStart(
       innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection),
       ParagraphGranularity);
 }
 
 void SelectionController::handleMousePressEvent(
     const MouseEventWithHitTestResults& event) {
   // If we got the event back, that must mean it wasn't prevented,
@@ skipping 274 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