Merge webkit.org at r54731 : Initial merge by git

Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a

1 files changed, 21 insertions, 3 deletions

diff --git a/WebKit/chromium/public/WebView.h b/WebKit/chromium/public/WebView.h
index 7b3294f..99125d4 100644
--- a/WebKit/chromium/public/WebView.h
+++ b/WebKit/chromium/public/WebView.h
@@ -223,17 +223,35 @@ public:
     virtual WebAccessibilityObject accessibilityObject() = 0;
 
 
-    // Autofill ------------------------------------------------------------
+    // AutoFill / Autocomplete ---------------------------------------------
 
-    // Notifies the WebView that autofill suggestions are available for a node.
+    // DEPRECATED: WebView::applyAutocompleteSuggestions is the new way to
+    // access this.
     virtual void applyAutofillSuggestions(
         const WebNode&,
         const WebVector<WebString>& suggestions,
         int defaultSuggestionIndex) = 0;
 
-    // Hides the autofill popup if any are showing.
+    // Notifies the WebView that AutoFill suggestions are available for a node.
+    virtual void applyAutoFillSuggestions(
+        const WebNode&,
+        const WebVector<WebString>& names,
+        const WebVector<WebString>& labels,
+        int defaultSuggestionIndex) = 0;
+
+    // Notifies the WebView that Autocomplete suggestions are available for a
+    // node.
+    virtual void applyAutocompleteSuggestions(
+        const WebNode&,
+        const WebVector<WebString>& suggestions,
+        int defaultSuggestionIndex) = 0;
+
+    // DEPRECATED: WebView::hideSuggestionsPopup is the new way to access this.
     virtual void hideAutofillPopup() = 0;
 
+    // Hides the suggestions popup if any are showing.
+    virtual void hideSuggestionsPopup() = 0;
+
 
     // Context menu --------------------------------------------------------