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

This reverts commit f0923517bb5c7e712e56d19cf702992b84491bda.

Change-Id: I504e4ba69a4de911df938547e542684cf0ef7862

diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
index e77416f..bd0b0f3 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
@@ -848,7 +848,12 @@ static void _ewk_view_smart_add(Evas_Object* ewkView)
         evas_object_image_content_hint_set(smartData->image, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
 #endif
 
+#if ENABLE(TIZEN_DESKTOP_BROWSING)
+    ewk_view_mouse_events_enabled_set(ewkView, true);
+#else
     ewk_view_mouse_events_enabled_set(ewkView, false);
+#endif
+
     ewk_view_touch_events_enabled_set(ewkView, true);
 
     // FIXME: This code should be removed if side effect occur.

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/GestureRecognizer.cpp b/Source/WebKit2/UIProcess/API/efl/tizen/GestureRecognizer.cpp
index 5a255bb..1218baf 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/GestureRecognizer.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/GestureRecognizer.cpp
@@ -26,10 +26,6 @@
 #include "config.h"
 #include "GestureRecognizer.h"
 
-#if ENABLE(TIZEN_DESKTOP_BROWSING)
-#include "NativeWebMouseEvent.h"
-#endif
-
 #include <WebCore/IntSize.h>
 #include <WebCore/IntPoint.h>
 
@@ -90,11 +86,6 @@ GestureRecognizer::~GestureRecognizer()
         evas_object_del(m_gestureObject);
 
     evas_object_event_callback_del(m_viewWidget, EVAS_CALLBACK_MOUSE_UP, onMouseUp);
-
-#if ENABLE(TIZEN_DESKTOP_BROWSING)
-    evas_object_event_callback_del(m_viewWidget, EVAS_CALLBACK_MOUSE_MOVE, onMouseMove);
-    evas_object_event_callback_del(m_viewWidget, EVAS_CALLBACK_MOUSE_DOWN, onMouseDown);
-#endif
 }
 
 void GestureRecognizer::initializeCallbacks()
@@ -121,11 +112,6 @@ void GestureRecognizer::initializeCallbacks()
 
     // add evas callbacks.
     evas_object_event_callback_add(m_viewWidget, EVAS_CALLBACK_MOUSE_UP, onMouseUp, this);
-
-#if ENABLE(TIZEN_DESKTOP_BROWSING)
-    evas_object_event_callback_add(m_viewWidget, EVAS_CALLBACK_MOUSE_MOVE, onMouseMove, this);
-    evas_object_event_callback_add(m_viewWidget, EVAS_CALLBACK_MOUSE_DOWN, onMouseDown, this);
-#endif
 }
 
 Evas_Event_Flags GestureRecognizer::onTapStart(void* data, void* eventInfo)
@@ -204,44 +190,11 @@ Evas_Event_Flags GestureRecognizer::onZoomStart(void* data, void* eventInfo)
     return EVAS_EVENT_FLAG_NONE;
 }
 
-void GestureRecognizer::onMouseUp(void* data, Evas*, Evas_Object* ewkView, void* eventInfo)
+void GestureRecognizer::onMouseUp(void* data, Evas*, Evas_Object*, void* eventInfo)
 {
     Evas_Event_Mouse_Up* event = static_cast<Evas_Event_Mouse_Up*>(eventInfo);
     static_cast<GestureRecognizer*>(data)->processScheduledTap(event->canvas.x, event->canvas.y, event->timestamp);
-
-#if ENABLE(TIZEN_DESKTOP_BROWSING)
-    Ewk_View_Smart_Data* smartData = 0;
-    smartData = (Ewk_View_Smart_Data*)evas_object_smart_data_get(ewkView);
-    EwkViewImpl* impl = smartData->priv;
-
-    impl->page()->handleMouseEvent(NativeWebMouseEvent(event, impl->transformFromScene(), impl->transformToScreen()));
-#endif
-}
-
-#if ENABLE(TIZEN_DESKTOP_BROWSING)
-void GestureRecognizer::onMouseDown(void* data, Evas*, Evas_Object* ewkView, void* eventInfo)
-{
-    Evas_Event_Mouse_Down* event = static_cast<Evas_Event_Mouse_Down*>(eventInfo);
-
-    Ewk_View_Smart_Data* smartData = 0;
-    smartData = (Ewk_View_Smart_Data*)evas_object_smart_data_get(ewkView);
-    EwkViewImpl* impl = smartData->priv;
-
-    impl->page()->handleMouseEvent(NativeWebMouseEvent(event, impl->transformFromScene(), impl->transformToScreen()));
-
-}
-
-void GestureRecognizer::onMouseMove(void* data, Evas*, Evas_Object* ewkView, void* eventInfo)
-{
-    Evas_Event_Mouse_Move* event = static_cast<Evas_Event_Mouse_Move*>(eventInfo);
-
-    Ewk_View_Smart_Data* smartData = 0;
-    smartData = (Ewk_View_Smart_Data*)evas_object_smart_data_get(ewkView);
-    EwkViewImpl* impl = smartData->priv;
-
-    impl->page()->handleMouseEvent(NativeWebMouseEvent(event, impl->transformFromScene(), impl->transformToScreen()));
 }
-#endif
 
 void GestureRecognizer::startTap(Elm_Gesture_Taps_Info* event)
 {

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/GestureRecognizer.h b/Source/WebKit2/UIProcess/API/efl/tizen/GestureRecognizer.h
index a492224..bfc673b 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/GestureRecognizer.h
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/GestureRecognizer.h
@@ -91,11 +91,6 @@ private:
 
     static void onMouseUp(void* data, Evas*, Evas_Object*, void* eventInfo);
 
-#if ENABLE(TIZEN_DESKTOP_BROWSING)
-    static void onMouseDown(void* data, Evas*, Evas_Object*, void* eventInfo);
-    static void onMouseMove(void* data, Evas*, Evas_Object*, void* eventInfo);
-#endif
-
 private:
     static const int s_defaultFramerate = 60;
     static const double s_thumbscrollMomentumThreshold;