Fix 10573: Dismissing FindInPage doesn't set focus to the link...

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 1352 matching lines @@
   scope_matches_factory_.RevokeAll();
   active_match_index_ = -1;
 }
 
 void WebFrameImpl::SetFindEndstateFocusAndSelection() {
   WebFrameImpl* main_frame_impl =
       static_cast<WebFrameImpl*>(GetView()->GetMainFrame());
 
   if (this == main_frame_impl->active_match_frame() &&
       active_match_.get()) {
-    // If the user has changed the selection since the match was found, we
+    // If the user has set the selection since the match was found, we
     // don't focus anything.
     VisibleSelection selection(frame()->selection()->selection());
-    if (selection.isNone() || (selection.start() == selection.end()) ||
-        active_match_->boundingBox() !=
-            selection.toNormalizedRange()->boundingBox())
+    if (!selection.isNone())
       return;
 
     // 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 = active_match_->firstNode();
     while (node && !node->isFocusable() && node != frame()->document())
@@ skipping 562 matching lines @@
   return password_listeners_.get(input_element);
 }
 
 void WebFrameImpl::ClearPasswordListeners() {
   for (PasswordListenerMap::iterator iter = password_listeners_.begin();
        iter != password_listeners_.end(); ++iter) {
     delete iter->second;
   }
   password_listeners_.clear();
 }