Improving the form autofill menu behavior

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 404 matching lines @@
   // member.
   // The suppress_next_keypress_event_ is set if the KeyDown is handled by
   // Webkit. A keyDown event is typically associated with a keyPress(char)
   // event and a keyUp event. We reset this flag here as this is a new keyDown
   // event.
   suppress_next_keypress_event_ = false;
 
   // Give autocomplete a chance to consume the key events it is interested in.
   if (autocomplete_popup_ &&
       autocomplete_popup_->isInterestedInEventForKey(event.key_code)) {
-    if (autocomplete_popup_->handleKeyEvent(MakePlatformKeyboardEvent(event)))
+    if (autocomplete_popup_->handleKeyEvent(MakePlatformKeyboardEvent(event))) {
+#if defined(OS_WIN)
+      // We need to ignore the next CHAR event after this otherwise pressing
+      // enter when selecting an item in the menu will go to the page.
+      if (WebInputEvent::KEY_DOWN == event.type)
+        suppress_next_keypress_event_ = true;
+#endif
       return true;
+    }
     return false;
   }
 
   // A new key being pressed should hide the popup.
   if (event.type == WebInputEvent::KEY_DOWN)
     HideAutoCompletePopup();
 
   Frame* frame = GetFocusedWebCoreFrame();
   if (!frame)
     return false;
@@ skipping 1080 matching lines @@
     if (suggestions.size() > 0) {
       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
       // 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_->show(focused_node->getRect(), frame->view(), 0);
     }
   }
 }
 
 void WebViewImpl::DidCommitLoad(bool* is_new_navigation) {
   if (is_new_navigation)
     *is_new_navigation = observed_new_navigation_;
 
 #ifndef NDEBUG
@@ skipping 141 matching lines @@
   MessageLoop::current()->DeleteSoon(FROM_HERE, fetcher);
 }
 
 void WebViewImpl::HideAutoCompletePopup() {
   if (autocomplete_popup_) {
     autocomplete_popup_->hidePopup();
     autocomplete_popup_.clear();
     autocomplete_popup_client_.clear();
   }
 }