Introduce CreateVisibleSelectionWithGranularity()

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

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1110 matching lines @@
 // two |IntPoint| instead of two |VisiblePosition| like
 // |moveRangeSelectionExtent()|.
 void FrameSelection::MoveRangeSelection(const VisiblePosition& base_position,
                                         const VisiblePosition& extent_position,
                                         TextGranularity granularity) {
   SelectionInDOMTree new_selection =
       SelectionInDOMTree::Builder()
           .SetBaseAndExtentDeprecated(base_position.DeepEquivalent(),
                                       extent_position.DeepEquivalent())
           .SetAffinity(base_position.Affinity())
-          .SetGranularity(granularity)
           .SetIsHandleVisible(IsHandleVisible())
           .Build();
 
   if (new_selection.IsNone())
     return;
 
-  const VisibleSelection visible_selection =
-      CreateVisibleSelection(new_selection);
+  const VisibleSelection& visible_selection =
+      CreateVisibleSelectionWithGranularity(new_selection, granularity);
   if (visible_selection.IsNone())
     return;
 
   SelectionInDOMTree::Builder builder;
   if (visible_selection.IsBaseFirst()) {
     builder.SetBaseAndExtent(visible_selection.Start(),
                              visible_selection.End());
   } else {
     builder.SetBaseAndExtent(visible_selection.End(),
                              visible_selection.Start());
@@ skipping 46 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->ShowTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif