summaryrefslogtreecommitdiffstats
path: root/WebKit/android/nav/WebView.cpp
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2011-01-12 07:34:43 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-12 07:34:43 -0800
commit0369c1903611073755e7f9811fb342dc0110c71b (patch)
tree359661fdb2c20146833417a1dd3259e9c80bf825 /WebKit/android/nav/WebView.cpp
parentc2c69275e9299b10712cdc05a9ae4cdc235cb48b (diff)
parent4ba38126aa5964cd2e1922f3234c745032b5db59 (diff)
downloadexternal_webkit-0369c1903611073755e7f9811fb342dc0110c71b.zip
external_webkit-0369c1903611073755e7f9811fb342dc0110c71b.tar.gz
external_webkit-0369c1903611073755e7f9811fb342dc0110c71b.tar.bz2
Merge "Remove the WebTextView always when moving off a textfield." into honeycomb
Diffstat (limited to 'WebKit/android/nav/WebView.cpp')
-rw-r--r--WebKit/android/nav/WebView.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 8252bb8..08508e0 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -840,8 +840,9 @@ bool moveCursor(int keyCode, int count, bool ignoreScroll)
m_viewImpl->updateCursorBounds(root, cachedFrame, cachedNode);
root->setCursor(const_cast<CachedFrame*>(cachedFrame),
const_cast<CachedNode*>(cachedNode));
- bool clearTextEntry = cachedNode != root->currentFocus()
- && cachedNode->wantsKeyEvents();
+ const CachedNode* focus = root->currentFocus();
+ bool clearTextEntry = cachedNode != focus
+ && focus->isTextInput();
sendMoveMouseIfLatest(clearTextEntry);
sendMoveSelection((WebCore::Frame*) cachedFrame->framePointer(),
(WebCore::Node*) cachedNode->nodePointer());