diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 16:57:26 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 10:37:20 +0100 |
| commit | fe73b6358fa742d943e85ba9a90544a7b6ba8d9d (patch) | |
| tree | f969023078c7326ccd32b367f5a68bf52c5da6bc /Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | |
| parent | 7f5ad71c769697c27d049e0006e5086d5461ea54 (diff) | |
| download | external_webkit-fe73b6358fa742d943e85ba9a90544a7b6ba8d9d.zip external_webkit-fe73b6358fa742d943e85ba9a90544a7b6ba8d9d.tar.gz external_webkit-fe73b6358fa742d943e85ba9a90544a7b6ba8d9d.tar.bz2 | |
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
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 5 |
1 files changed, 4 insertions, 1 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); } |