Introduce EphemeralRange::nodes() helper to traverse over a range.

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1625 matching lines @@
 
         // Try to find the first focusable node up the chain, which will, for
         // example, focus links if we have found text within the link.
         Node* node = activeMatch->firstNode();
         if (node && node->isInShadowTree()) {
             if (Node* host = node->shadowHost()) {
                 if (isHTMLInputElement(*host) || isHTMLTextAreaElement(*host))
                     node = host;
             }
         }
+        const EphemeralRange activeMatchRange(activeMatch);
         if (node) {
             for (Node& runner : NodeTraversal::inclusiveAncestorsOf(*node)) {
                 if (!runner.isElementNode())
                     continue;
                 Element& element = toElement(runner);
                 if (element.isFocusable()) {
                     // Found a focusable parent node. Set the active match as the
                     // selection and focus to the focusable node.
-                    frame()->selection().setSelection(VisibleSelection(EphemeralRange(activeMatch)));
+                    frame()->selection().setSelection(VisibleSelection(activeMatchRange));
                     frame()->document()->setFocusedElement(&element, FocusParams(SelectionBehaviorOnFocus::None, WebFocusTypeNone, nullptr));
                     return;
                 }
             }
         }
 
         // Iterate over all the nodes in the range until we find a focusable node.
         // This, for example, sets focus to the first link if you search for
         // text and text that is within one or more links.
-        node = activeMatch->firstNode();
-        for (; node && node != activeMatch->pastLastNode(); node = NodeTraversal::next(*node)) {
-            if (!node->isElementNode())
+        for (Node& runner : activeMatchRange.nodes()) {
+            if (!runner.isElementNode())
                 continue;
-            Element* element = toElement(node);
-            if (element->isFocusable()) {
-                frame()->document()->setFocusedElement(element, FocusParams(SelectionBehaviorOnFocus::None, WebFocusTypeNone, nullptr));
+            Element& element = toElement(runner);
+            if (element.isFocusable()) {
+                frame()->document()->setFocusedElement(&element, FocusParams(SelectionBehaviorOnFocus::None, WebFocusTypeNone, nullptr));
                 return;
             }
         }
 
         // No node related to the active match was focusable, so set the
         // active match as the selection (so that when you end the Find session,
         // you'll have the last thing you found highlighted) and make sure that
         // we have nothing focused (otherwise you might have text selected but
         // a link focused, which is weird).
-        frame()->selection().setSelection(VisibleSelection(EphemeralRange(activeMatch)));
+        frame()->selection().setSelection(VisibleSelection(activeMatchRange));
         frame()->document()->clearFocusedElement();
 
         // Finally clear the active match, for two reasons:
         // We just finished the find 'session' and we don't want future (potentially
         // unrelated) find 'sessions' operations to start at the same place.
         // The WebLocalFrameImpl could get reused and the activeMatch could end up pointing
         // to a document that is no longer valid. Keeping an invalid reference around
         // is just asking for trouble.
         m_textFinder->resetActiveMatch();
     }
@@ skipping 458 matching lines @@
 {
     frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
 }
 
 void WebLocalFrameImpl::clearActiveFindMatch()
 {
     ensureTextFinder().clearActiveFindMatch();
 }
 
 } // namespace blink