Fix bug 455: Active match in Find is not selected and links are not focused a...

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, 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 1207 matching lines @@
   InvalidateArea(INVALIDATE_ALL);
 
   return;
 }
 
 void WebFrameImpl::CancelPendingScopingEffort() {
   scope_matches_factory_.RevokeAll();
   active_tickmark_ = WidgetClientWin::kNoTickmark;
 }
 
-void WebFrameImpl::StopFinding() {
+void WebFrameImpl::SetFindEndstateFocusAndSelection() {
+  WebFrameImpl* main_frame_impl =
+      static_cast<WebFrameImpl*>(GetView()->GetMainFrame());
+
+  if (this == main_frame_impl->active_tickmark_frame() &&
+      active_tickmark_ != WidgetClientWin::kNoTickmark) {
+    RefPtr<Range> range = tickmarks_[active_tickmark_];
+
+    // Set the selection to what the active match is.
+    frame()->selectionController()->setSelectedRange(
+        range.get(), WebCore::DOWNSTREAM, false);
+
+    // We will be setting focus ourselves, so we want the view to forget its
+    // stored focus node so that it won't change it after we are done.
+    static_cast<WebViewImpl*>(GetView())->ReleaseFocusReferences();
+
+    // 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 = range->startNode();
+    while (!node->isFocusable() && node != frame()->document())
+      node = node->parent();
+
+    if (node != frame()->document()) {
+      // Found a focusable parent node. Set focus to it.
+      frame()->document()->setFocusedNode(node);
+    } else {
+      // 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 = range->startNode();
+      while (node != NULL && node != range->pastEndNode()) {
+        if (node->isFocusable()) {
+          frame()->document()->setFocusedNode(node);
+          break;
+        }
+        node = node->traverseNextNode();
+      }
+    }
+  }
+}
+
+void WebFrameImpl::StopFinding(bool clear_selection) {
+  if (!clear_selection)
+    SetFindEndstateFocusAndSelection();
   CancelPendingScopingEffort();
 
   // Let the frame know that we don't want tickmarks or highlighting anymore.
   tickmarks_.clear();
   InvalidateArea(INVALIDATE_ALL);
 }
 
 void WebFrameImpl::SelectAll() {
   frame()->selectionController()->selectAll();
 
@@ skipping 569 matching lines @@
 }
 
 bool WebFrameImpl::IsReloadAllowingStaleData() const {
   FrameLoader* loader = frame() ? frame()->loader() : NULL;
   if (loader) {
     return WebCore::FrameLoadTypeReloadAllowingStaleData ==
            loader->policyLoadType();
   }
   return false;
 }