Revert "Fix touch issue on mobile simulator/target."

This reverts commit 2c7b578b1b3c8f8b97eed869728c2330da6249e1.

Change-Id: I23b0950a390a6fca30629a0780cb0c53d9d523dd

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
index ef7d915..5b48809 100755 (executable)
--- a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
@@ -623,11 +623,59 @@ public:
 
   bool SendTouchEvent(const TouchEvent& touch)
   {
-#if defined(OS_TIZEN_TV)
-    return FeedMouseEvent(touch);
-#else
-    return FeedTouchEvent(touch);
-#endif
+    Ewk_Mouse_Button_Type type = (Ewk_Mouse_Button_Type)0;
+    switch (touch.GetMouseButton(0))
+    {
+      case MouseButton::PRIMARY:
+      {
+        type = EWK_Mouse_Button_Left;
+        break;
+      }
+      case MouseButton::TERTIARY:
+      {
+        type = EWK_Mouse_Button_Middle;
+        break;
+      }
+      case MouseButton::SECONDARY:
+      {
+        type = EWK_Mouse_Button_Right;
+        break;
+      }
+      default:
+      {
+        break;
+      }
+    }
+
+    switch (touch.GetState(0))
+    {
+      case PointState::DOWN:
+      {
+        float x = touch.GetScreenPosition(0).x;
+        float y = touch.GetScreenPosition(0).y;
+        ewk_view_feed_mouse_down(mWebView, type, x, y);
+        break;
+      }
+      case PointState::UP:
+      {
+        float x = touch.GetScreenPosition(0).x;
+        float y = touch.GetScreenPosition(0).y;
+        ewk_view_feed_mouse_up(mWebView, type, x, y);
+        break;
+      }
+      case PointState::MOTION:
+      {
+        float x = touch.GetScreenPosition(0).x;
+        float y = touch.GetScreenPosition(0).y;
+        ewk_view_feed_mouse_move(mWebView, x, y);
+        break;
+      }
+      default:
+      {
+        break;
+      }
+    }
+    return false;
   }
 
   bool SendKeyEvent(const Dali::KeyEvent& keyEvent)
@@ -1038,112 +1086,6 @@ private:
     client->HitTestCreated(std::move(webHitTest));
   }
 
-  bool FeedTouchEvent(const TouchEvent& touch)
-  {
-    Ewk_Touch_Event_Type type = EWK_TOUCH_START;
-    Evas_Touch_Point_State state = EVAS_TOUCH_POINT_DOWN;
-    switch (touch.GetState(0))
-    {
-      case PointState::DOWN:
-      {
-        type = EWK_TOUCH_START;
-        state = EVAS_TOUCH_POINT_DOWN;
-        break;
-      }
-      case PointState::UP:
-      {
-        type = EWK_TOUCH_END;
-        state = EVAS_TOUCH_POINT_UP;
-        break;
-      }
-      case PointState::MOTION:
-      {
-        type = EWK_TOUCH_MOVE;
-        state = EVAS_TOUCH_POINT_MOVE;
-        break;
-      }
-      case PointState::INTERRUPTED:
-      {
-        type = EWK_TOUCH_CANCEL;
-        state = EVAS_TOUCH_POINT_CANCEL;
-        break;
-      }
-      default:
-      {
-        break;
-      }
-    }
-
-    Eina_List* pointList = 0;
-    Ewk_Touch_Point* point = new Ewk_Touch_Point;
-    point->id = 0;
-    point->x = touch.GetScreenPosition(0).x;
-    point->y = touch.GetScreenPosition(0).y;
-    point->state = state;
-    pointList = eina_list_append(pointList, point);
-
-    ewk_view_feed_touch_event(mWebView, type, pointList, 0);
-    eina_list_free(pointList);
-    return false;
-  }
-
-  bool FeedMouseEvent(const TouchEvent& touch)
-  {
-    Ewk_Mouse_Button_Type type = (Ewk_Mouse_Button_Type)0;
-    switch (touch.GetMouseButton(0))
-    {
-      case MouseButton::PRIMARY:
-      {
-        type = EWK_Mouse_Button_Left;
-        break;
-      }
-      case MouseButton::TERTIARY:
-      {
-        type = EWK_Mouse_Button_Middle;
-        break;
-      }
-      case MouseButton::SECONDARY:
-      {
-        type = EWK_Mouse_Button_Right;
-        break;
-      }
-      default:
-      {
-        break;
-      }
-    }
-
-    switch (touch.GetState(0))
-    {
-      case PointState::DOWN:
-      {
-        float x = touch.GetScreenPosition(0).x;
-        float y = touch.GetScreenPosition(0).y;
-        ewk_view_feed_mouse_down(mWebView, type, x, y);
-        break;
-      }
-      case PointState::UP:
-      {
-        float x = touch.GetScreenPosition(0).x;
-        float y = touch.GetScreenPosition(0).y;
-        ewk_view_feed_mouse_up(mWebView, type, x, y);
-        break;
-      }
-      case PointState::MOTION:
-      {
-        float x = touch.GetScreenPosition(0).x;
-        float y = touch.GetScreenPosition(0).y;
-        ewk_view_feed_mouse_move(mWebView, x, y);
-        break;
-      }
-      default:
-      {
-        break;
-      }
-    }
-    return false;
-  }
-
 private:
   Evas_Object*            mWebView;
   WebViewContainerClient& mClient;

diff --git a/packaging/dali-extension.spec b/packaging/dali-extension.spec
index 2966dd2..0c56234 100755 (executable)
--- a/packaging/dali-extension.spec
+++ b/packaging/dali-extension.spec
@@ -240,11 +240,6 @@ CXXFLAGS+=" -DECORE_WL2 -DEFL_BETA_API_SUPPORT"
 configure_flags="--enable-ecore-wl2"
 %endif
 
-%if "%{?profile}" == "tv"
-CFLAGS+=" -DOS_TIZEN_TV"
-CXXFLAGS+=" -DOS_TIZEN_TV"
-%endif
-
 libtoolize --force
 cd %{_builddir}/%{name}-%{version}/build/tizen
 autoreconf --install