From a9cf40bab64a29201b65761ca30f9ff0c7e3e271 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 17 May 2010 17:28:09 +0100 Subject: 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 --- WebCore/plugins/PluginView.cpp | 2 ++ WebCore/plugins/android/PluginViewAndroid.cpp | 2 ++ 2 files changed, 4 insertions(+) (limited to 'WebCore') 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(event)); #if defined(ANDROID_PLUGINS) +#if ENABLE(TOUCH_EVENTS) else if (event->isTouchEvent()) handleTouchEvent(static_cast(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) { -- cgit v1.1