summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-12-16 14:19:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-16 14:19:39 -0800
commitf8edabae34835a386f3ddfda1974952698b9ece9 (patch)
tree3a3ec8ba4fa2b66d88cd067c008f7676c690abea /WebCore
parent5b2d816fcafa24b4d9c3c461fb1a3a0d880a93b5 (diff)
parenta82fdbb65304d541753351815d51ab4035a99dc9 (diff)
downloadexternal_webkit-f8edabae34835a386f3ddfda1974952698b9ece9.zip
external_webkit-f8edabae34835a386f3ddfda1974952698b9ece9.tar.gz
external_webkit-f8edabae34835a386f3ddfda1974952698b9ece9.tar.bz2
am a82fdbb6: am 050a2ac7: Merge change Ifcce71fa into eclair-mr2
Merge commit 'a82fdbb65304d541753351815d51ab4035a99dc9' * commit 'a82fdbb65304d541753351815d51ab4035a99dc9': Implement the full screen WebView plugin.
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/plugins/android/PluginViewAndroid.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp
index 4266a9a..69e0541 100644
--- a/WebCore/plugins/android/PluginViewAndroid.cpp
+++ b/WebCore/plugins/android/PluginViewAndroid.cpp
@@ -348,6 +348,10 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event)
if (m_plugin->pluginFuncs()->event(m_instance, &evt)) {
event->setDefaultHandled();
+ } else if (m_window->inFullScreen()){
+ // while in the full screen mode, always consumes the key events and
+ // keeps the document focus
+ event->setDefaultHandled();
} else {
// remove the plugin from the document's focus
m_parentFrame->document()->focusedNodeRemoved();