[M69 Dev][Tizen] Enable touch events for mobile/wearable profile

[platform/framework/web/chromium-efl.git] / tizen_src / chromium_impl / content / browser / renderer_host / render_widget_host_view_efl.cc

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
index 99e771c..b22225e 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
@@ -1428,21 +1428,16 @@ void RenderWidgetHostViewEfl::HandleGesture(blink::WebGestureEvent& event) {
 }
 
 void RenderWidgetHostViewEfl::HandleGesture(ui::GestureEvent* event) {
-  blink::WebGestureEvent gesture = MakeWebGestureEventFromUIEvent(*event);
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  gesture.x = event->x();
-  gesture.y = event->y();
-
-  const gfx::Point root_point = event->root_location();
-  gesture.global_x = root_point.x();
-  gesture.global_y = root_point.y();
-#endif
   if (event->type() == ui::ET_GESTURE_BEGIN)
     HandleGestureBegin();
   else if (event->type() == ui::ET_GESTURE_END)
     HandleGestureEnd();
 
-  SendGestureEvent(gesture);
+  blink::WebGestureEvent gesture_event = MakeWebGestureEventFromUIEvent(*event);
+  gesture_event.SetPositionInWidget(event->location_f());
+  gesture_event.SetPositionInScreen(event->root_location_f());
+  SendGestureEvent(gesture_event);
+
   event->SetHandled();
 }
 
@@ -1473,18 +1468,11 @@ void RenderWidgetHostViewEfl::ProcessAckedTouchEvent(
   ui::EventResult result = (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED)
                                ? ui::ER_HANDLED
                                : ui::ER_UNHANDLED;
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  std::unique_ptr<ui::GestureRecognizer::Gestures> gestures;
-  gestures.reset(gesture_recognizer_->AckTouchEvent(
-      touch.event.unique_touch_event_id, result, this));
-
-  if (gestures) {
-    for (size_t j = 0; j < gestures->size(); ++j) {
-      ui::GestureEvent* event = gestures.at(j);
-      HandleGesture(event);
-    }
-  }
-#endif  // !defined(EWK_BRINGUP)
+  ui::GestureRecognizer::Gestures gestures = gesture_recognizer_->AckTouchEvent(
+      touch.event.unique_touch_event_id, result,
+      false /* is_source_touch_event_set_non_blocking */, this);
+  for (const auto& event : gestures)
+    HandleGesture(event.get());
 }
 
 EdgeEffect& RenderWidgetHostViewEfl::EnsureEdgeEffect() {