Refactor SelectionModifier::{Left,Right}WordPosition()

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 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
@@ skipping 360 matching lines @@
                                            logical_start_in_layout_object);
     } else {
       bool logical_end_in_layout_object =
           offset_in_box ==
               static_cast<int>(text_box->Start() + text_box->Len()) &&
           next_box_in_different_block;
       is_word_break = IslogicalEndOfWord(iter, offset_in_iterator,
                                          logical_end_in_layout_object);
     }
 
-    if (is_word_break)
-      return adjacent_character_position;
+    if (is_word_break) {
+      return HonorEditingBoundaryAtOrBefore(adjacent_character_position,
+                                            visible_position.DeepEquivalent());
+    }
 
     current = adjacent_character_position;
   }
   return VisiblePosition();
 }
 
 }  // namespace
 
 VisiblePosition SelectionModifier::LeftWordPosition(
     const VisiblePosition& visible_position,
     bool skips_space_when_moving_right) {
   DCHECK(visible_position.IsValid()) << visible_position;
-  VisiblePosition left_word_break = VisualWordPosition(
+  const VisiblePosition& left_word_break = VisualWordPosition(
       visible_position, kMoveLeft, skips_space_when_moving_right);
-  left_word_break = HonorEditingBoundaryAtOrBefore(
-      left_word_break, visible_position.DeepEquivalent());
-
+  if (left_word_break.IsNotNull())
+    return left_word_break;
   // TODO(editing-dev) How should we handle a non-editable position?
-  if (left_word_break.IsNull() &&
-      IsEditablePosition(visible_position.DeepEquivalent())) {
-    TextDirection block_direction =
-        DirectionOfEnclosingBlockOf(visible_position.DeepEquivalent());
-    left_word_break = block_direction == TextDirection::kLtr
-                          ? StartOfEditableContent(visible_position)
-                          : EndOfEditableContent(visible_position);
-  }
-  return left_word_break;
+  if (!IsEditablePosition(visible_position.DeepEquivalent()))
+    return left_word_break;
+  const TextDirection block_direction =
+      DirectionOfEnclosingBlockOf(visible_position.DeepEquivalent());
+  return block_direction == TextDirection::kLtr
+             ? StartOfEditableContent(visible_position)
+             : EndOfEditableContent(visible_position);
 }
 
 VisiblePosition SelectionModifier::RightWordPosition(
     const VisiblePosition& visible_position,
     bool skips_space_when_moving_right) {
   DCHECK(visible_position.IsValid()) << visible_position;
-  VisiblePosition right_word_break = VisualWordPosition(
+  const VisiblePosition& right_word_break = VisualWordPosition(
       visible_position, kMoveRight, skips_space_when_moving_right);
-  right_word_break = HonorEditingBoundaryAtOrBefore(
-      right_word_break, visible_position.DeepEquivalent());
-
+  if (right_word_break.IsNotNull())
+    return right_word_break;
   // TODO(editing-dev) How should we handle a non-editable position?
-  if (right_word_break.IsNull() &&
-      IsEditablePosition(visible_position.DeepEquivalent())) {
-    TextDirection block_direction =
-        blink::DirectionOfEnclosingBlockOf(visible_position.DeepEquivalent());
-    right_word_break = block_direction == TextDirection::kLtr
-                           ? EndOfEditableContent(visible_position)
-                           : StartOfEditableContent(visible_position);
-  }
-  return right_word_break;
+  if (!IsEditablePosition(visible_position.DeepEquivalent()))
+    return right_word_break;
+  const TextDirection block_direction =
+      blink::DirectionOfEnclosingBlockOf(visible_position.DeepEquivalent());
+  return block_direction == TextDirection::kLtr
+             ? EndOfEditableContent(visible_position)
+             : StartOfEditableContent(visible_position);
 }
 
 }  // namespace blink