Introduce CreateVisibleSelectionWithGranularity()

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 517 matching lines @@
   // and isn't desirable for touch).
   HitTestResult adjusted_hit_test_result = result;
   if (select_input_event_type == SelectInputEventType::kTouch &&
       result.GetImage())
     adjusted_hit_test_result.SetNodeAndPosition(result.InnerNode(),
                                                 LayoutPoint(0, 0));
 
   const VisiblePositionInFlatTree& pos =
       VisiblePositionOfHitTestResult(adjusted_hit_test_result);
   const VisibleSelectionInFlatTree& new_selection =
-      pos.IsNotNull()
-          ? CreateVisibleSelection(SelectionInFlatTree::Builder()
-                                       .Collapse(pos.ToPositionWithAffinity())
-                                       .SetGranularity(kWordGranularity)
-                                       .Build())
-          : VisibleSelectionInFlatTree();
+      pos.IsNotNull() ? CreateVisibleSelectionWithGranularity(
+                            SelectionInFlatTree::Builder()
+                                .Collapse(pos.ToPositionWithAffinity())
+                                .Build(),
+                            kWordGranularity)
+                      : VisibleSelectionInFlatTree();
 
   HandleVisibility visibility = HandleVisibility::kNotVisible;
   if (select_input_event_type == SelectInputEventType::kTouch) {
     // If node doesn't have text except space, tab or line break, do not
     // select that 'empty' area.
     EphemeralRangeInFlatTree range(new_selection.Start(), new_selection.End());
     const String& str = PlainText(
         range,
         TextIteratorBehavior::Builder()
             .SetEmitsObjectReplacementCharacter(HasEditableStyle(*inner_node))
@@ skipping 342 matching lines @@
     return false;
 
   Node* const inner_node = event.InnerNode();
   if (!(inner_node && inner_node->GetLayoutObject() &&
         mouse_down_may_start_select_))
     return false;
 
   const VisiblePositionInFlatTree& pos =
       VisiblePositionOfHitTestResult(event.GetHitTestResult());
   const VisibleSelectionInFlatTree new_selection =
-      pos.IsNotNull()
-          ? CreateVisibleSelection(SelectionInFlatTree::Builder()
-                                       .Collapse(pos.ToPositionWithAffinity())
-                                       .SetGranularity(kParagraphGranularity)
-                                       .Build())
-          : VisibleSelectionInFlatTree();
+      pos.IsNotNull() ? CreateVisibleSelectionWithGranularity(
+                            SelectionInFlatTree::Builder()
+                                .Collapse(pos.ToPositionWithAffinity())
+                                .Build(),
+                            kParagraphGranularity)
+                      : VisibleSelectionInFlatTree();
 
   const bool is_handle_visible =
       event.Event().FromTouch() && new_selection.IsRange();
 
   const bool did_select = UpdateSelectionForMouseDownDispatchingSelectStart(
       inner_node,
       ExpandSelectionToRespectUserSelectAll(inner_node, new_selection),
       kParagraphGranularity,
       is_handle_visible ? HandleVisibility::kVisible
                         : HandleVisibility::kNotVisible);
@@ skipping 330 matching lines @@
 
 bool IsExtendingSelection(const MouseEventWithHitTestResults& event) {
   bool is_mouse_down_on_link_or_image =
       event.IsOverLink() || event.GetHitTestResult().GetImage();
   return (event.Event().GetModifiers() & WebInputEvent::Modifiers::kShiftKey) !=
              0 &&
          !is_mouse_down_on_link_or_image;
 }
 
 }  // namespace blink