Home and End keys should not be processed by the autocomplete popup

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 60 matching lines @@
 #endif
 #include "RenderView.h"
 #include "ResourceHandle.h"
 #include "SelectionController.h"
 #include "Settings.h"
 #include "TypingCommand.h"
 MSVC_POP_WARNING();
 #undef LOG
 
 #include "base/gfx/rect.h"
+#include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "webkit/glue/chrome_client_impl.h"
 #include "webkit/glue/clipboard_conversion.h"
 #include "webkit/glue/context_menu_client_impl.h"
 #include "webkit/glue/dragclient_impl.h"
 #include "webkit/glue/editor_client_impl.h"
 #include "webkit/glue/event_conversion.h"
 #include "webkit/glue/glue_serialize.h"
@@ skipping 39 matching lines @@
                               const std::vector<std::wstring>& suggestions,
                               int default_suggestion_index)
       : text_field_(text_field),
         selected_index_(default_suggestion_index),
         webview_(webview) {
     SetSuggestions(suggestions);
   }
   virtual ~AutocompletePopupMenuClient() {
   }
 
+  // WebCore::PopupMenuClient implementation.
   virtual void valueChanged(unsigned listIndex, bool fireEvents = true) {
     text_field_->setValue(suggestions_[listIndex]);
   }  
 
   virtual WebCore::String itemText(unsigned list_index) const {
     return suggestions_[list_index];
   }
   
   virtual bool itemIsEnabled(unsigned listIndex) const {
     return true;
@@ skipping 73 matching lines @@
   virtual PassRefPtr<Scrollbar> createScrollbar(
       ScrollbarClient* client,
       ScrollbarOrientation orientation,
       ScrollbarControlSize size) {
     RefPtr<Scrollbar> widget = Scrollbar::createNativeScrollbar(client, 
                                                                 orientation,
                                                                 size);
     return widget.release();
   }
 
+  // AutocompletePopupMenuClient specific methods:
   void SetSuggestions(const std::vector<std::wstring>& suggestions) {
     suggestions_.clear();
     for (std::vector<std::wstring>::const_iterator iter = suggestions.begin();
          iter != suggestions.end(); ++iter) {
       suggestions_.push_back(webkit_glue::StdWStringToString(*iter));
     }
     // Try to preserve selection if possible.
     if (selected_index_ >= static_cast<int>(suggestions.size()))
       selected_index_ = -1;
   }
@@ skipping 201 matching lines @@
 
   // Please refer to the comments explaining the suppress_next_keypress_event_
   // 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 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;
-    }
-  }
+  if (AutocompleteHandleKeyEvent(event))
+    return true;
 
   Frame* frame = GetFocusedWebCoreFrame();
   if (!frame)
     return false;
 
   EventHandler* handler = frame->eventHandler();
   if (!handler)
     return KeyEventDefault(event);
 
 #if defined(OS_WIN)
@@ skipping 31 matching lines @@
   // that we'll know that this is the only time we'll have the event and that
   // we need to do our thing.
   if (handler->keyEvent(evt)) {
     return true;
   }
 #endif
 
   return KeyEventDefault(event);
 }
 
+bool WebViewImpl::AutocompleteHandleKeyEvent(const WebKeyboardEvent& event) {
+  if (!autocomplete_popup_ ||
+      // Home and End should be left to the text field to process.
+      event.key_code == base::VKEY_HOME || event.key_code == base::VKEY_END) {
+    return false;
+  }
+
+  if (!autocomplete_popup_->isInterestedInEventForKey(event.key_code))
+    return false;
+
+  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;
+}
+  
 bool WebViewImpl::CharEvent(const WebKeyboardEvent& event) {
   DCHECK(event.type == WebInputEvent::CHAR);
 
   // Please refer to the comments explaining the suppress_next_keypress_event_
   // 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 it only applies
   // to the current keyPress event.
   if (suppress_next_keypress_event_) {
@@ skipping 1105 matching lines @@
   Frame* frame = page_->focusController()->focusedFrame();
   if (!frame)
     return NULL;
 
   Document* document = frame->document();
   if (!document)
     return NULL;
 
   return document->focusedNode();
 }