Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

1 files changed, 4 insertions, 1 deletions

diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index 31ef028..0712815 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -73,7 +73,8 @@ public:
     // so any subsequent calls to createSessionStorageNamespace conform to the
     // WebStorage specification.
     virtual WebView* createView(WebFrame* creator,
-                                const WebWindowFeatures& features) { return 0; }
+                                const WebWindowFeatures& features,
+                                const WebString& name) { return 0; }
 
     // Create a new WebPopupMenu.  In the second form, the client is
     // responsible for rendering the contents of the popup menu.
@@ -124,6 +125,8 @@ public:
 
     virtual bool isSmartInsertDeleteEnabled() { return true; }
     virtual bool isSelectTrailingWhitespaceEnabled() { return true; }
+
+    // DEPRECATED: replaced by WebWidgetClient::resetInputMethod().
     virtual void setInputMethodEnabled(bool enabled) { }
 
     virtual void didBeginEditing() { }