Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760

1 files changed, 23 insertions, 5 deletions

diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index e0fe71d..31ef028 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -202,6 +202,9 @@ public:
     virtual bool runModalBeforeUnloadDialog(
         WebFrame*, const WebString& message) { return true; }
 
+    virtual bool supportsFullscreen() { return false; }
+    virtual void enterFullscreenForNode(const WebNode&) { }
+    virtual void exitFullscreenForNode(const WebNode&) { }
 
     // UI ------------------------------------------------------------------
 
@@ -273,7 +276,7 @@ public:
     virtual void didUpdateInspectorSetting(const WebString& key, const WebString& value) { }
 
 
-    // Autofill ------------------------------------------------------------
+    // AutoFill ------------------------------------------------------------
 
     // Queries the browser for suggestions to be shown for the form text
     // field named |name|.  |value| is the text entered by the user so
@@ -282,18 +285,33 @@ public:
                                           const WebString& name,
                                           const WebString& value) { }
 
-    // Instructs the browser to remove the autofill entry specified from
+    // Instructs the browser to remove the Autocomplete entry specified from
     // its DB.
+    // FIXME: This method should be named removeAutocompleteSugestion.
     virtual void removeAutofillSuggestions(const WebString& name,
                                            const WebString& value) { }
 
-    // Informs the browser that the user has selected an AutoFill suggestion
-    // for a WebNode.  |name| and |label| form a key into the set of AutoFill
-    // profiles.
+    // Informs the browser that the user has accepted an AutoFill suggestion for
+    // a WebNode.  |name| and |label| form a key into the set of AutoFill
+    // profiles.  |index| is an index of the selected suggestion in the list of
+    // suggestions provided by the client
     virtual void didAcceptAutoFillSuggestion(const WebNode&,
                                              const WebString& name,
+                                             const WebString& label,
+                                             unsigned index) { }
+
+    // Informs the browser that the user has selected an AutoFill suggestion for
+    // a WebNode.  This happens when the user hovers over a suggestion or uses
+    // the arrow keys to navigate to a suggestion.
+    virtual void didSelectAutoFillSuggestion(const WebNode&,
+                                             const WebString& name,
                                              const WebString& label) { }
 
+    // Informs the browser that the user has cleared the selection from the
+    // AutoFill suggestions dropdown.  This happens when a user uses the arrow
+    // keys to navigate outside the range of possible selections.
+    virtual void didClearAutoFillSelection(const WebNode&) { }
+
     // Geolocation ---------------------------------------------------------
 
     // Access the embedder API for geolocation services.