Refactor PreviousRootInlineBoxCandidatePosition()

third_party/WebKit/Source/core/editing/VisibleUnitsLine.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 213 matching lines @@
   DCHECK(visible_position.IsValid()) << visible_position;
   ContainerNode* highest_root =
       HighestEditableRoot(visible_position.DeepEquivalent(), editable_type);
   Node* previous_node = PreviousLeafWithSameEditability(node, editable_type);
 
   while (previous_node && InSameLine(*previous_node, visible_position)) {
     previous_node =
         PreviousLeafWithSameEditability(previous_node, editable_type);
   }
 
-  while (previous_node && !previous_node->IsShadowRoot()) {
-    if (HighestEditableRoot(FirstPositionInOrBeforeNode(previous_node),
+  for (Node* runner = previous_node; runner && !runner->IsShadowRoot();
+       runner = PreviousLeafWithSameEditability(runner, editable_type)) {
+    if (HighestEditableRoot(FirstPositionInOrBeforeNode(runner),
                             editable_type) != highest_root)
       break;
 
-    Position pos = isHTMLBRElement(*previous_node)
-                       ? Position::BeforeNode(previous_node)
-                       : Position::EditingPositionOf(
-                             previous_node, CaretMaxOffset(previous_node));
-
-    if (IsVisuallyEquivalentCandidate(pos))
-      return pos;
-
-    previous_node =
-        PreviousLeafWithSameEditability(previous_node, editable_type);
+    const Position& candidate =
+        isHTMLBRElement(*runner)
+            ? Position::BeforeNode(runner)
+            : Position::EditingPositionOf(runner, CaretMaxOffset(runner));
+    if (IsVisuallyEquivalentCandidate(candidate))
+      return candidate;
   }
   return Position();
 }
 
 Position NextRootInlineBoxCandidatePosition(
     Node* node,
     const VisiblePosition& visible_position,
     EditableType editable_type) {
   DCHECK(visible_position.IsValid()) << visible_position;
   ContainerNode* highest_root =
@@ skipping 428 matching lines @@
   // to the end of the line we're on.
   Element* root_element = HasEditableStyle(*node, editable_type)
                               ? RootEditableElement(*node, editable_type)
                               : node->GetDocument().documentElement();
   if (!root_element)
     return VisiblePosition();
   return VisiblePosition::LastPositionInNode(root_element);
 }
 
 }  // namespace blink