Merge WebKit at r72274: Initial merge by git.

Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb

1 files changed, 10 insertions, 4 deletions

diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index edd9579..7ce1483 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -117,6 +117,10 @@ public:
     virtual void didStartLoading() { }
     virtual void didStopLoading() { }
 
+    // Notification that some progress was made loading the current page.
+    // loadProgress is a value between 0 (nothing loaded) and 1.0 (frame fully
+    // loaded).
+    virtual void didChangeLoadProgress(WebFrame*, double loadProgress) { }
 
     // Editing -------------------------------------------------------------
 
@@ -305,11 +309,13 @@ public:
                                            const WebString& value) { }
 
     // 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
+    // a WebNode.  |uniqueID| is used as a key into the set of AutoFill profiles,
+    // and should never be negative.  If it is 0, then the suggestion is an
+    // Autocomplete suggestion; and |value| stores the suggested text.  |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& value,
                                              const WebString& label,
                                              int uniqueID,
                                              unsigned index) { }