summaryrefslogtreecommitdiffstats
path: root/WebKit/android/plugins/PluginWidgetAndroid.h
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2010-01-25 13:18:25 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-25 13:18:25 -0800
commit562a8a469695e0a2dee4eb1946847553f04ca2a2 (patch)
treec198c44089b3cbb9363dafb1dcabdd49cedfa9b9 /WebKit/android/plugins/PluginWidgetAndroid.h
parent71ce050b9dbf42b1f1f33269021af49371c20a54 (diff)
parent53c84f3caf7c84282400134fa9554cd465ec7da8 (diff)
downloadexternal_webkit-562a8a469695e0a2dee4eb1946847553f04ca2a2.zip
external_webkit-562a8a469695e0a2dee4eb1946847553f04ca2a2.tar.gz
external_webkit-562a8a469695e0a2dee4eb1946847553f04ca2a2.tar.bz2
am 53c84f3c: Do not allow the plugin to show or hide the keyboard unless it has focus.
Merge commit '53c84f3caf7c84282400134fa9554cd465ec7da8' into eclair-mr2-plus-aosp * commit '53c84f3caf7c84282400134fa9554cd465ec7da8': Do not allow the plugin to show or hide the keyboard unless it has focus.
Diffstat (limited to 'WebKit/android/plugins/PluginWidgetAndroid.h')
-rw-r--r--WebKit/android/plugins/PluginWidgetAndroid.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.h b/WebKit/android/plugins/PluginWidgetAndroid.h
index b723995..1245d0c 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.h
+++ b/WebKit/android/plugins/PluginWidgetAndroid.h
@@ -134,6 +134,12 @@ struct PluginWidgetAndroid {
bool inFullScreen() { return m_isFullScreen; }
+ /** Called to check if a plugin currently has document focus, which is
+ required for certain operations (e.g. show/hide keyboard). It returns
+ true if the plugin currently has focus and false otherwise.
+ */
+ bool hasFocus() const { return m_hasFocus; }
+
private:
void computeVisiblePluginRect();
void scrollToVisiblePluginRect();