Update the find result index "(m of n)" whenever there is an active selection...

webkit/api/src/WebFrameImpl.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 1088 matching lines @@
     else
         setMarkerActive(m_activeMatch.get(), false);  // Active match is changing.
 
     // Starts the search from the current selection.
     bool startInSelection = true;
 
     // If the user has selected something since the last Find operation we want
     // to start from there. Otherwise, we start searching from where the last Find
     // operation left off (either a Find or a FindNext operation).
     VisibleSelection selection(frame()->selection()->selection());
-    if (selection.isNone() && m_activeMatch) {
+    bool activeSelection = !selection.isNone();
+    if (!activeSelection && m_activeMatch) {
         selection = VisibleSelection(m_activeMatch.get());
         frame()->selection()->setSelection(selection);
     }
 
     ASSERT(frame() && frame()->view());
     bool found = frame()->findString(
         searchText, options.forward, options.matchCase, wrapWithinFrame,
         startInSelection);
     if (found) {
         // Store which frame was active. This will come in handy later when we
@@ skipping 14 matching lines @@
         if (newSelection.isNone() || (newSelection.start() == newSelection.end()))
             m_activeMatch = 0;
         else {
             m_activeMatch = newSelection.toNormalizedRange();
             currSelectionRect = m_activeMatch->boundingBox();
             setMarkerActive(m_activeMatch.get(), true);  // Active.
             // WebKit draws the highlighting for all matches.
             executeCommand(WebString::fromUTF8("Unselect"));
         }
 
-        if (!options.findNext) {
-            // This is a Find operation, so we set the flag to ask the scoping effort
+        if (!options.findNext || activeSelection) {
+            // This is either a Find operation or a Find-next from a new start point
+            // due to a selection, so we set the flag to ask the scoping effort
             // to find the active rect for us so we can update the ordinal (n of m).
             m_locatingActiveRect = true;
         } else {
             if (oldActiveFrame != this) {
                 // If the active frame has changed it means that we have a multi-frame
                 // page and we just switch to searching in a new frame. Then we just
                 // want to reset the index.
                 if (options.forward)
                     m_activeMatchIndex = 0;
                 else
@@ skipping 725 matching lines @@
 
     if (!m_frame->redirectScheduler()->locationChangePending()) {
         m_frame->loader()->stopAllLoaders();
         m_frame->loader()->begin(m_frame->loader()->url(), true, securityOrigin);
         m_frame->loader()->write(scriptResult);
         m_frame->loader()->end();
     }
 }
 
 } // namespace WebKit