Merge WebKit to r80534: Fix ChromeClientAndroid

tabsToLinks() has been removed and keyboardUIMode() has
been added. See http://trac.webkit.org/changeset/80279

Change-Id: Idd92678728737fa313cfababff4d9aadee83be76

2 files changed, 5 insertions, 2 deletions

diff --git a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 60f6263..1c8f398 100644
--- a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -279,7 +279,10 @@ bool ChromeClientAndroid::shouldInterruptJavaScript() {
   return android::WebViewCore::getWebViewCore(frameView)->jsInterrupt();
 }
 
-bool ChromeClientAndroid::tabsToLinks() const { return false; }
+KeyboardUIMode ChromeClientAndroid::keyboardUIMode()
+{
+    return KeyboardAccessDefault;
+}
 
 IntRect ChromeClientAndroid::windowResizerRect() const { return IntRect(0, 0, 0, 0); }
 
diff --git a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index 6d8f6f3..daaeb48 100644
--- a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -108,7 +108,7 @@ namespace android {
         virtual bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result);
         virtual void setStatusbarText(const String&);
         virtual bool shouldInterruptJavaScript();
-        virtual bool tabsToLinks() const;
+        virtual KeyboardUIMode keyboardUIMode();
 
         virtual IntRect windowResizerRect() const;