Add way to remove entries from autocomplete

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 246 matching lines @@
     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;
   }
 
+  void RemoveItemAtIndex(int index) {
+    DCHECK(index >= 0 && index < static_cast<int>(suggestions_.size()));
+    suggestions_.erase(suggestions_.begin() + index);
+  }
+
   WebCore::HTMLInputElement* text_field() const {
     return text_field_.get();
   }
 
   WebCore::RenderStyle* GetTextFieldStyle() const {
     WebCore::RenderStyle* style = text_field_->computedStyle();
     if (!style) {
       // It seems we can only have an NULL style in a TextField if the node is
       // dettached, in which case we the popup shoud not be showing.
       NOTREACHED() << "Please report this in http://crbug.com/7708 and include "
@@ skipping 254 matching lines @@
 }
 
 bool WebViewImpl::AutocompleteHandleKeyEvent(const WebKeyboardEvent& event) {
   if (!autocomplete_popup_showing_ ||
       // Home and End should be left to the text field to process.
       event.windows_key_code == base::VKEY_HOME ||
       event.windows_key_code == base::VKEY_END) {
     return false;
   }
 
+  // Pressing delete triggers the removal of the selected suggestion from the
+  // DB.
+  if (event.windows_key_code == base::VKEY_DELETE &&
+      autocomplete_popup_->selectedIndex() != -1) {
+    Node* node = GetFocusedNode();
+    if (!node || (node->nodeType() != WebCore::Node::ELEMENT_NODE)) {
+      NOTREACHED();
+      return false;
+    }
+    WebCore::Element* element = static_cast<WebCore::Element*>(node);
+    if (!element->hasLocalName(WebCore::HTMLNames::inputTag)) {
+      NOTREACHED();
+      return false;
+    }
+
+    int selected_index = autocomplete_popup_->selectedIndex();
+    WebCore::HTMLInputElement* input_element =
+        static_cast<WebCore::HTMLInputElement*>(element);
+    std::wstring name = webkit_glue::StringToStdWString(input_element->name());
+    std::wstring value = webkit_glue::StringToStdWString(
+        autocomplete_popup_client_->itemText(selected_index ));
+    delegate()->RemoveStoredAutofillEntry(name, value);
+    // Update the entries in the currently showing popup to reflect the
+    // deletion.
+    autocomplete_popup_client_->RemoveItemAtIndex(selected_index);
+    RefreshAutofillPopup();
+    return false;
+  }
+
   if (!autocomplete_popup_->isInterestedInEventForKey(event.windows_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::RAW_KEY_DOWN == event.type)
         suppress_next_keypress_event_ = true;
 #endif
@@ skipping 1029 matching lines @@
                                      suggestions,
                                      default_suggestion_index);
     if (!autocomplete_popup_.get()) {
       autocomplete_popup_ =
           WebCore::PopupContainer::create(autocomplete_popup_client_.get(),
                                           kAutocompletePopupSettings);
     }
 
     if (autocomplete_popup_showing_) {
       autocomplete_popup_client_->SetSuggestions(suggestions);
-      IntRect old_bounds = autocomplete_popup_->boundsRect();
-      autocomplete_popup_->refresh();
-      IntRect new_bounds = autocomplete_popup_->boundsRect();
-      // Let's resize the backing window if necessary.
-      if (old_bounds != new_bounds) {
-        WebWidgetImpl* web_widget =
-            static_cast<WebWidgetImpl*>(autocomplete_popup_->client());
-        web_widget->delegate()->SetWindowRect(
-            web_widget, webkit_glue::FromIntRect(new_bounds));
-      }
+      RefreshAutofillPopup();
     } else {
       autocomplete_popup_->show(focused_node->getRect(),
                                 focused_node->ownerDocument()->view(), 0);
       autocomplete_popup_showing_ = true;
     }
   }
 }
 
 void WebViewImpl::DidCommitLoad(bool* is_new_navigation) {
   if (is_new_navigation)
@@ skipping 79 matching lines @@
   if (autocomplete_popup_) {
     autocomplete_popup_->hidePopup();
     autocomplete_popup_showing_ = false;
   }
 }
 
 void WebViewImpl::HideAutofillPopup() {
   HideAutoCompletePopup();
 }
 
+void WebViewImpl::RefreshAutofillPopup() {
+  DCHECK(autocomplete_popup_showing_);
+  IntRect old_bounds = autocomplete_popup_->boundsRect();
+  autocomplete_popup_->refresh();
+  IntRect new_bounds = autocomplete_popup_->boundsRect();
+  // Let's resize the backing window if necessary.
+  if (old_bounds != new_bounds) {
+    WebWidgetImpl* web_widget =
+        static_cast<WebWidgetImpl*>(autocomplete_popup_->client());
+    web_widget->delegate()->SetWindowRect(
+        web_widget, webkit_glue::FromIntRect(new_bounds));
+  }
+}
+
 Node* WebViewImpl::GetFocusedNode() {
   Frame* frame = page_->focusController()->focusedFrame();
   if (!frame)
     return NULL;
 
   Document* document = frame->document();
   if (!document)
     return NULL;
 
   return document->focusedNode();
 }