Refactor NextLeafWithSameEditability()

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 84 matching lines @@
   }
   return nullptr;
 }
 
 Node* NextLeafWithSameEditability(
     Node* node,
     EditableType editable_type = kContentIsEditable) {
   if (!node)
     return nullptr;
 
-  bool editable = HasEditableStyle(*node, editable_type);
-  node = NextAtomicLeafNode(*node);
-  while (node) {
-    if (editable == HasEditableStyle(*node, editable_type))
-      return node;
-    node = NextAtomicLeafNode(*node);
+  const bool editable = HasEditableStyle(*node, editable_type);
+  for (Node* runner = NextAtomicLeafNode(*node); runner;
+       runner = NextAtomicLeafNode(*runner)) {
+    if (editable == HasEditableStyle(*runner, editable_type))
+      return runner;
   }
   return nullptr;
 }
 
 enum LineEndpointComputationMode { kUseLogicalOrdering, kUseInlineBoxOrdering };
 template <typename Strategy>
 PositionWithAffinityTemplate<Strategy> StartPositionForLine(
     const PositionWithAffinityTemplate<Strategy>& c,
     LineEndpointComputationMode mode) {
   if (c.IsNull())
@@ skipping 559 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