Autofill popup dismissed when page loses focus

webkit/glue/webview_impl.cc

 /*
 * Copyright 2007 Google Inc. All Rights Reserved.
 *
 * Portions Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
 *
 * ***** BEGIN LICENSE BLOCK *****
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
@@ skipping 925 matching lines @@
 void WebViewImpl::StopLoading() {
   main_frame()->StopLoading();
 }
 
 void WebViewImpl::SetBackForwardListSize(int size) {
   page_->backForwardList()->setCapacity(size);
 }
 
 void WebViewImpl::SetFocus(bool enable) {
   if (enable) {
-    // Hide the popup menu if any.
-    // TODO(jcampan): bug #3844: we should do that when we lose focus.  The
-    // reason we are not doing it is because when clicking on the autofill
-    // popup, the page first loses focus before the mouse click is sent to the
-    // popup.  So if we close when the focus is lost, the mouse click does not
-    // do anything.
-    HideAutoCompletePopup();
-
     // Getting the focused frame will have the side-effect of setting the main
     // frame as the focused frame if it is not already focused.  Otherwise, if
     // there is already a focused frame, then this does nothing.
     GetFocusedFrame();
     if (page_.get() && page_->mainFrame()) {
       Frame* frame = page_->mainFrame();
       if (!frame->selection()->isFocusedAndActive()) {
         // No one has focus yet, try to restore focus.
         RestoreFocus();
         page_->focusController()->setActive(true);
       }
       Frame* focused_frame = page_->focusController()->focusedOrMainFrame();
       frame->selection()->setFocused(frame == focused_frame);
     }
     ime_accept_events_ = true;
   } else {
+    HideAutoCompletePopup();
+
     // Clear out who last had focus. If someone has focus, the refs will be
     // updated below.
     ReleaseFocusReferences();
 
     // Clear focus on the currently focused frame if any.
     if (!page_.get())
       return;
 
     Frame* frame = page_->mainFrame();
     if (!frame)
@@ skipping 522 matching lines @@
     }
 
     WebCore::HTMLInputElement* input_elem =
         static_cast<WebCore::HTMLInputElement*>(focused_node.get());
     if (!autocomplete_popup_client_.get() ||
         autocomplete_popup_client_->text_field() != input_elem) {
       autocomplete_popup_client_ =
           adoptRef(new AutocompletePopupMenuClient(this, input_elem,
                                                    suggestions,
                                                    default_suggestion_index));
-      // Autocomplete popup does not get focused.  We need the page to still
+      // The autocomplete popup is not activated.  We need the page to still
       // have focus so the user can keep typing when the popup is showing.
       autocomplete_popup_ =
           WebCore::PopupContainer::create(autocomplete_popup_client_.get(),
                                           false);
       autocomplete_popup_->setTextOnIndexChange(false);
       autocomplete_popup_->setAcceptOnAbandon(false);
       autocomplete_popup_->show(focused_node->getRect(), 
                                 page_->mainFrame()->view(), 0);
     } else {
       // There is already a popup, reuse it.
@@ skipping 113 matching lines @@
   Frame* frame = page_->focusController()->focusedFrame();
   if (!frame)
     return NULL;
 
   Document* document = frame->document();
   if (!document)
     return NULL;
 
   return document->focusedNode();
 }