diff options
| author | Derek Sollenberger <djsollen@google.com> | 2010-01-25 07:22:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-25 07:22:37 -0800 |
| commit | 53e1af87fa4f19eac50b3d6fb45a3a386d156cd0 (patch) | |
| tree | 910857e6b273ce472cd74b084e6f404af1b68f51 /WebCore/plugins | |
| parent | de7e9124bea659d873d5488809d92a334104cb53 (diff) | |
| parent | 2eb76d0bcdf5cdc45cf6188c8bb76a409612235b (diff) | |
| download | external_webkit-53e1af87fa4f19eac50b3d6fb45a3a386d156cd0.zip external_webkit-53e1af87fa4f19eac50b3d6fb45a3a386d156cd0.tar.gz external_webkit-53e1af87fa4f19eac50b3d6fb45a3a386d156cd0.tar.bz2 | |
am 2eb76d0b: Add logging for all plugin events and their return values.
Merge commit '2eb76d0bcdf5cdc45cf6188c8bb76a409612235b' into eclair-mr2-plus-aosp
* commit '2eb76d0bcdf5cdc45cf6188c8bb76a409612235b':
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 c4bccdb..ed7a694 100644 --- a/WebCore/plugins/android/PluginViewAndroid.cpp +++ b/WebCore/plugins/android/PluginViewAndroid.cpp @@ -212,7 +212,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) { @@ -259,7 +259,7 @@ void PluginView::handleMouseEvent(MouseEvent* event) return; } - if (m_plugin->pluginFuncs()->event(m_instance, &evt)) { + if (m_window->sendEvent(evt)) { event->setDefaultHandled(); } } @@ -348,7 +348,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 |