summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2011-01-21 14:25:40 -0500
committerDerek Sollenberger <djsollen@google.com>2011-01-21 14:30:01 -0500
commit7ab151a3c6a4efc42f6e3a4d09254c6767d13fec (patch)
tree703eb4b987b8eb8217b95b334bd9ae982ff395b2 /WebKit
parent492fe96285a5ba81e8ece3754ed6a8feb5bbeff5 (diff)
downloadexternal_webkit-7ab151a3c6a4efc42f6e3a4d09254c6767d13fec.zip
external_webkit-7ab151a3c6a4efc42f6e3a4d09254c6767d13fec.tar.gz
external_webkit-7ab151a3c6a4efc42f6e3a4d09254c6767d13fec.tar.bz2
Do not dismiss the keyboard if the plugin is the focused node.
bug: 3332478 Change-Id: I358ed2c828e39adc8d6e80eaaa0071854e03c655
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/jni/WebViewCore.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 5523793..51565bb 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -3083,7 +3083,7 @@ bool WebViewCore::handleMouseClick(WebCore::Frame* framePtr, WebCore::Node* node
// input is needed.
if (isContentEditable(focusNode)) {
requestKeyboard(true);
- } else {
+ } else if (!nodeIsPlugin(focusNode)) {
clearTextEntry();
}
}