diff options
| author | Steve Block <steveblock@google.com> | 2010-05-17 17:28:09 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-18 12:15:39 +0100 |
| commit | a9cf40bab64a29201b65761ca30f9ff0c7e3e271 (patch) | |
| tree | dbf752415f61355c9de411cf4e0dfe39bc36f750 /WebCore | |
| parent | 4cd028871582a7f15f06fa772e65aa2f76e4e0d5 (diff) | |
| download | external_webkit-a9cf40bab64a29201b65761ca30f9ff0c7e3e271.zip external_webkit-a9cf40bab64a29201b65761ca30f9ff0c7e3e271.tar.gz external_webkit-a9cf40bab64a29201b65761ca30f9ff0c7e3e271.tar.bz2 | |
Adds missing ENABLE(TOUCH_EVENTS) guards to Android-specific code
This will allow us to build with touch events disabled once we've merged
https://bugs.webkit.org/show_bug.cgi?id=39222
Change-Id: Ia665e5e6c3b4169b6c5576aa26721d95e72934e9
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) { |