fixup! [dev/m42][uBrowser] One point touch.

We can use the same method as multi touch callback for
up/down/move events.

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=12716
Reviewed by: Piotr Tworek, arno renevier

Change-Id: Iae532cdf70068f4d4cd17c2ca874eb2e57b0b3d7
Signed-off-by: Antonio Gomes <a1.gomes@samsung.com>

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 0366e51..33839c7 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
@@ -193,11 +193,11 @@ void RenderWidgetHostViewEfl::InitAsChild(gfx::NativeView parent_view) {
       OnKeyUp, this);
 
   evas_object_event_callback_add(content_image_, EVAS_CALLBACK_MULTI_DOWN,
-      OnPointerDown, this);
+      OnMultiTouchEvent, this);
   evas_object_event_callback_add(content_image_, EVAS_CALLBACK_MULTI_MOVE,
-      OnPointerMove, this);
+      OnMultiTouchEvent, this);
   evas_object_event_callback_add(content_image_, EVAS_CALLBACK_MULTI_UP,
-      OnPointerUp, this);
+      OnMultiTouchEvent, this);
 
   // IMContext calls evas() getter on 'this' so it needs to be
   // initialized after evas_ is valid
@@ -242,11 +242,11 @@ RenderWidgetHostViewEfl::~RenderWidgetHostViewEfl() {
       OnKeyUp);
 
   evas_object_event_callback_del(content_image_, EVAS_CALLBACK_MULTI_DOWN,
-      OnPointerDown);
+      OnMultiTouchEvent);
   evas_object_event_callback_del(content_image_, EVAS_CALLBACK_MULTI_MOVE,
-      OnPointerMove);
+      OnMultiTouchEvent);
   evas_object_event_callback_del(content_image_, EVAS_CALLBACK_MULTI_UP,
-      OnPointerUp);
+      OnMultiTouchEvent);
 
   evas_object_del(content_image_elm_host_);
   content_image_elm_host_ = NULL;
@@ -1144,15 +1144,6 @@ void RenderWidgetHostViewEfl::OnMouseDown(
   }
 }
 
-void RenderWidgetHostViewEfl::OnPointerDown(
-    void* data, Evas* evas, Evas_Object* obj, void* event_info) {
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-  rwhv->Focus();
-
-  CHECK(rwhv->touch_events_enabled_);
-  rwhv->ProcessTouchEvents();
-}
-
 void RenderWidgetHostViewEfl::OnMouseUp(
     void* data, Evas* evas, Evas_Object* obj, void* event_info) {
   RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
@@ -1170,13 +1161,6 @@ void RenderWidgetHostViewEfl::OnMouseUp(
   }
 }
 
-void RenderWidgetHostViewEfl::OnPointerUp(
-    void* data, Evas* evas, Evas_Object* obj, void* event_info) {
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-  CHECK(rwhv->touch_events_enabled_);
-  rwhv->ProcessTouchEvents();
-}
-
 void RenderWidgetHostViewEfl::OnMouseMove(
     void* data, Evas* evas, Evas_Object* obj, void* event_info) {
   RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
@@ -1193,7 +1177,7 @@ void RenderWidgetHostViewEfl::OnMouseMove(
   }
 }
 
-void RenderWidgetHostViewEfl::OnPointerMove(
+void RenderWidgetHostViewEfl::OnMultiTouchEvent(
     void* data, Evas* evas, Evas_Object* obj, void* event_info) {
   RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
   CHECK(rwhv->touch_events_enabled_);

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
index db40845..a61c208 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
@@ -219,9 +219,7 @@ class RenderWidgetHostViewEfl
   static void OnMotionMove(void* data, Evas_Object*, void*);
   static void OnMotionZoom(void* data, Evas_Object*, void*);
 
-  static void OnPointerDown(void* data, Evas*, Evas_Object*, void*);
-  static void OnPointerUp(void* data, Evas*, Evas_Object*, void*);
-  static void OnPointerMove(void* data, Evas*, Evas_Object*, void*);
+  static void OnMultiTouchEvent(void* data, Evas*, Evas_Object*, void*);
 
   static void OnMouseDown(void* data, Evas*, Evas_Object*, void*);
   static void OnMouseUp(void* data, Evas*, Evas_Object*, void*);