diff options
| author | Steve Block <steveblock@google.com> | 2010-05-18 04:23:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-18 04:23:49 -0700 |
| commit | f25a1d43265db801f96df26ab1058c071f8114a1 (patch) | |
| tree | 3ce24c5ae6a5387ab9ddcf7f3da6b0ec97fe499a /WebCore | |
| parent | 597b6ea5ce33c643654043c82d0bb087586fb27a (diff) | |
| parent | a9cf40bab64a29201b65761ca30f9ff0c7e3e271 (diff) | |
| download | external_webkit-f25a1d43265db801f96df26ab1058c071f8114a1.zip external_webkit-f25a1d43265db801f96df26ab1058c071f8114a1.tar.gz external_webkit-f25a1d43265db801f96df26ab1058c071f8114a1.tar.bz2 | |
Merge "Adds missing ENABLE(TOUCH_EVENTS) guards to Android-specific code"
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/plugins/PluginView.cpp | 2 | ||||
| -rw-r--r-- | WebCore/plugins/android/PluginViewAndroid.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp index da01a43..fe24109 100644 --- a/WebCore/plugins/PluginView.cpp +++ b/WebCore/plugins/PluginView.cpp @@ -171,8 +171,10 @@ void PluginView::handleEvent(Event* event) else if (event->isKeyboardEvent()) handleKeyboardEvent(static_cast<KeyboardEvent*>(event)); #if defined(ANDROID_PLUGINS) +#if ENABLE(TOUCH_EVENTS) else if (event->isTouchEvent()) handleTouchEvent(static_cast<TouchEvent*>(event)); +#endif else if (event->type() == eventNames().DOMFocusOutEvent) handleFocusEvent(false); else if (event->type() == eventNames().DOMFocusInEvent) diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp index ab6d365..cb069bc 100644 --- a/WebCore/plugins/android/PluginViewAndroid.cpp +++ b/WebCore/plugins/android/PluginViewAndroid.cpp @@ -185,6 +185,7 @@ void PluginView::platformDestroy() delete m_window; } +#if ENABLE(TOUCH_EVENTS) void PluginView::handleTouchEvent(TouchEvent* event) { if (!m_window->isAcceptingEvent(kTouch_ANPEventFlag)) @@ -228,6 +229,7 @@ void PluginView::handleTouchEvent(TouchEvent* event) if (m_window->sendEvent(evt)) event->preventDefault(); } +#endif void PluginView::handleMouseEvent(MouseEvent* event) { |