diff options
| author | Derek Sollenberger <djsollen@google.com> | 2010-01-25 07:39:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-25 07:39:50 -0800 |
| commit | 8f790f8dd3f2e5085a6f3c7bbff878e77fd7ed01 (patch) | |
| tree | 7cc61d539ae13869cef313aac23df533f9639fb7 /WebCore/plugins | |
| parent | 5106648b32c4af91bb26f2a5af60a2c1eac14a78 (diff) | |
| parent | 53e1af87fa4f19eac50b3d6fb45a3a386d156cd0 (diff) | |
| download | external_webkit-8f790f8dd3f2e5085a6f3c7bbff878e77fd7ed01.zip external_webkit-8f790f8dd3f2e5085a6f3c7bbff878e77fd7ed01.tar.gz external_webkit-8f790f8dd3f2e5085a6f3c7bbff878e77fd7ed01.tar.bz2 | |
am 53e1af87: am 2eb76d0b: Add logging for all plugin events and their return values.
Merge commit '53e1af87fa4f19eac50b3d6fb45a3a386d156cd0'
* commit '53e1af87fa4f19eac50b3d6fb45a3a386d156cd0':
Add logging for all plugin events and their return values.
Diffstat (limited to 'WebCore/plugins')
| -rw-r--r-- | WebCore/plugins/android/PluginViewAndroid.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp index 72fdf3f..41dc668 100644 --- a/WebCore/plugins/android/PluginViewAndroid.cpp +++ b/WebCore/plugins/android/PluginViewAndroid.cpp @@ -219,7 +219,7 @@ void PluginView::handleTouchEvent(TouchEvent* event) evt.data.touch.x = localPos.x(); evt.data.touch.y = localPos.y(); - int16 ret = m_plugin->pluginFuncs()->event(m_instance, &evt); + int16 ret = m_window->sendEvent(evt); if (ignoreRet) return; if (ret & kHandleTouch_ANPTouchResult) { @@ -266,7 +266,7 @@ void PluginView::handleMouseEvent(MouseEvent* event) return; } - if (m_plugin->pluginFuncs()->event(m_instance, &evt)) { + if (m_window->sendEvent(evt)) { event->setDefaultHandled(); } } @@ -355,7 +355,7 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event) evt.data.key.modifiers = make_modifiers(pke->shiftKey(), pke->altKey()); evt.data.key.unichar = pke->unichar(); - if (m_plugin->pluginFuncs()->event(m_instance, &evt)) { + if (m_window->sendEvent(evt)) { event->setDefaultHandled(); } else if (m_window->inFullScreen()){ // while in the full screen mode, always consumes the key events and |