Refactor SelectionController::SelectClosestWordFromHitTestResult()

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 461 matching lines @@
   SetNonDirectionalSelectionIfNeeded(selection, granularity,
                                      kDoNotAdjustEndpoints, handle_visibility);
 
   return true;
 }
 
 bool SelectionController::SelectClosestWordFromHitTestResult(
     const HitTestResult& result,
     AppendTrailingWhitespace append_trailing_whitespace,
     SelectInputEventType select_input_event_type) {
-  Node* inner_node = result.InnerNode();
-  VisibleSelectionInFlatTree new_selection;
+  Node* const inner_node = result.InnerNode();
 
   if (!inner_node || !inner_node->GetLayoutObject() ||
       !inner_node->GetLayoutObject()->IsSelectable())
     return false;
 
   // Special-case image local offset to always be zero, to avoid triggering
   // LayoutReplaced::positionFromPoint's advancement of the position at the
   // mid-point of the the image (which was intended for mouse-drag selection
   // 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);
-  if (pos.IsNotNull()) {
-    new_selection =
-        CreateVisibleSelection(SelectionInFlatTree::Builder()
-                                   .Collapse(pos.ToPositionWithAffinity())
-                                   .SetGranularity(kWordGranularity)
-                                   .Build());
-  }
+  VisibleSelectionInFlatTree new_selection =
+      pos.IsNotNull()
+          ? CreateVisibleSelection(SelectionInFlatTree::Builder()
+                                       .Collapse(pos.ToPositionWithAffinity())
+                                       .SetGranularity(kWordGranularity)
+                                       .Build())
+          : 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))
             .Build());
     if (str.IsEmpty() || str.SimplifyWhiteSpace().ContainsOnlyWhitespace())
       return false;
 
     if (new_selection.RootEditableElement() &&
         pos.DeepEquivalent() == VisiblePositionInFlatTree::LastPositionInNode(
                                     *new_selection.RootEditableElement())
                                     .DeepEquivalent())
       return false;
 
     visibility = HandleVisibility::kVisible;
   }
 
   if (append_trailing_whitespace == AppendTrailingWhitespace::kShouldAppend)
     new_selection.AppendTrailingWhitespace();

[yoichio, 2017/07/04 05:32:18]

How about making AppendTrailingWhitespace() const and return VS like
 javascript string functions?

 
   return UpdateSelectionForMouseDownDispatchingSelectStart(
       inner_node,
       ExpandSelectionToRespectUserSelectAll(inner_node, new_selection),
       kWordGranularity, visibility);
 }
 
 void SelectionController::SelectClosestMisspellingFromHitTestResult(
     const HitTestResult& result,
     AppendTrailingWhitespace append_trailing_whitespace) {
@@ skipping 670 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