TIVI-2082: Do not emulate mouse events while handling a tap gesture.

Tizen IVI supports mouse and touch events at a time so we don't need
to emulate mouse events while handling a tap gesture.

For this, this patch disables GESTURE_EVENT and TIZEN_LINK_MAGNIFIER for IVI and
reverts the following commit (f0923517bb5c7e712e56d19cf702992b84491bda).

"[Regression] Make scrolling work with mouse events support"

Change-Id: Ibaedb730bc15773a55b291cf315474c745a52412

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 38f3ed6..5bc2483 100644 (file)
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -330,10 +330,12 @@
 #define ENABLE_TIZEN_MULTIPLE_SELECT 0
 #define ENABLE_TIZEN_WEBKIT2_POPUP_INTERNAL 0
 #define ENABLE_TIZEN_LINK_EFFECT 0
+#define ENABLE_TIZEN_LINK_MAGNIFIER 0
 #else
 #define ENABLE_TIZEN_MULTIPLE_SELECT 1 /*Santosh Mahto (santosh.ma@samsung.com) : enable the feature of handling select element multple selection */
 #define ENABLE_TIZEN_WEBKIT2_POPUP_INTERNAL 1 /* Ryuan Choi(ryuan.choi@samsung.com) : popup implementation for WK2/tizen internal */
 #define ENABLE_TIZEN_LINK_EFFECT 1 /* Sanghyup Lee(sh53.lee@samsung.com) To beep when click link*/
+#define ENABLE_TIZEN_LINK_MAGNIFIER 1 /* Sangyong Park(sy302.park@samsung.com) : feature for link magnifier */
 #endif
 
 #define ENABLE_TIZEN_PASTEBOARD 1 /* Michal Pakula(m.pakula@samsung.com), Eunmi Lee(eunmi15.lee@samsung.com) : Pasteboard implementation for WK1 and WK2. */
@@ -346,7 +348,6 @@
 #define ENABLE_TIZEN_DOM_TIMER_MIN_INTERVAL_SET 1 /* Gyuyoung Kim(gyuyoung.kim@samsung.com) : Set minimum interval for DOMTimer */
 #define ENABLE_TIZEN_ON_LOADING_REQUESTED 1 /*Sungman Kim(ssungmai.kim@samsung.com) : Callback call for signal navigation_policy,decision,requested with navigation type*/
 #define ENABLE_TIZEN_CACHE_CONTROL 1 /*Sungman Kim(ssungmai.kim@samsung.com) : Control cache enable or disable mode*/
-#define ENABLE_TIZEN_LINK_MAGNIFIER 1 /* Sangyong Park(sy302.park@samsung.com) : feature for link magnifier */
 
 /* This patch should be removed if multiple UIProcess can exist concurrently.
    This will be removed when libsoup can handle multiple process file concurrency problem. */

diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
index 64ac373..1f50f3d 100755 (executable)
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
@@ -2697,6 +2697,7 @@ bool EventHandler::bestZoomableAreaForTouchPoint(const IntPoint& touchCenter, co
     return findBestZoomableArea(targetNode, targetArea, touchCenter, touchRect, *nodeList.get());
 }
 
+#if ENABLE(GESTURE_EVENTS)
 bool EventHandler::adjustGesturePosition(const PlatformGestureEvent& gestureEvent, IntPoint& adjustedPoint)
 {
     Node* targetNode = 0;
@@ -2714,6 +2715,7 @@ bool EventHandler::adjustGesturePosition(const PlatformGestureEvent& gestureEven
     return targetNode;
 }
 #endif
+#endif
 
 #if ENABLE(CONTEXT_MENUS)
 bool EventHandler::sendContextMenuEvent(const PlatformMouseEvent& event)

diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h
index 6380aaa..317803d 100644 (file)
--- a/Source/WebCore/page/EventHandler.h
+++ b/Source/WebCore/page/EventHandler.h
@@ -176,9 +176,10 @@ public:
     bool bestClickableNodeForTouchPoint(const IntPoint& touchCenter, const IntSize& touchRadius, IntPoint& targetPoint, Node*& targetNode);
     bool bestContextMenuNodeForTouchPoint(const IntPoint& touchCenter, const IntSize& touchRadius, IntPoint& targetPoint, Node*& targetNode);
     bool bestZoomableAreaForTouchPoint(const IntPoint& touchCenter, const IntSize& touchRadius, IntRect& targetArea, Node*& targetNode);
-
+#if ENABLE(GESTURE_EVENTS)
     bool adjustGesturePosition(const PlatformGestureEvent&, IntPoint& adjustedPoint);
 #endif
+#endif
 
 #if ENABLE(CONTEXT_MENUS)
     bool sendContextMenuEvent(const PlatformMouseEvent&);

diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
index bd0b0f3..5bcc246 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
@@ -4103,9 +4103,6 @@ void ewk_view_touch_event_handler_result_set(Evas_Object* ewkView, WebKit::WebEv
         impl->focusRing->hide();
 #endif // #if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
 
-    if (impl->mouseEventsEnabled())
-        return;
-
 #if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
     if (wasHandled && impl->pageClient->isTextSelectionMode()) {
         if (type == WebEvent::TouchStart)

diff --git a/Source/cmake/OptionsTizen.cmake b/Source/cmake/OptionsTizen.cmake
index d5f4ef7..a4d3393 100644 (file)
--- a/Source/cmake/OptionsTizen.cmake
+++ b/Source/cmake/OptionsTizen.cmake
@@ -258,7 +258,9 @@ FIND_PACKAGE(UIGadget REQUIRED)
 FIND_PACKAGE(VConf REQUIRED)
 FIND_PACKAGE(feedback REQUIRED)
 
-ADD_DEFINITIONS(-DENABLE_GESTURE_EVENTS=1)
+IF (NOT ENABLE_TIZEN_DESKTOP_BROWSING)
+    ADD_DEFINITIONS(-DENABLE_GESTURE_EVENTS=1)
+ENDIF()
 ADD_DEFINITIONS(-DWTF_USE_EGL=1)
 ADD_DEFINITIONS(-DWTF_USE_OPENGL_ES_2=1)