From 6a002a681dcfd9e55b9d4b8087c23deb346cf762 Mon Sep 17 00:00:00 2001
From: "yh106.jung" <yh106.jung@samsung.com>
Date: Tue, 10 Mar 2015 21:22:18 +0900
Subject: [PATCH] Enable SetTouchEventsEnabled, SetMouseEventsEnabled

This commit enables SetTouchEventsEnabled, SetMouseEventsEnabled in EWebView

Change-Id: Ibc4ce41ec6588f2433d52bf6761aa89c467d5fa9
Signed-off-by: yh106.jung <yh106.jung@samsung.com>
---
 .../renderer_host/render_widget_host_view_efl.cc   |  4 ++++
 .../renderer_host/render_widget_host_view_efl.h    |  1 +
 tizen_src/ewk/efl_integration/eweb_view.cc         | 24 ++++------------------
 3 files changed, 9 insertions(+), 20 deletions(-)

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 2576655..47476a0 100644
--- 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
@@ -1277,6 +1277,10 @@ void RenderWidgetHostViewEfl::ProcessTouchEvents() {
 #endif
 }
 
+void RenderWidgetHostViewEfl::SetTouchEventsEnabled(bool enabled) {
+  touch_events_enabled_ = enabled;
+}
+
 void RenderWidgetHostViewEfl::set_magnifier(bool status) {
    magnifier_ = status;
 }
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 0d3aed0..e0173b6 100644
--- 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
@@ -195,6 +195,7 @@ class RenderWidgetHostViewEfl
   void ConfirmComposition(base::string16& text);
   void SendGestureEvent(blink::WebGestureEvent& event);
 
+  void SetTouchEventsEnabled(bool enabled);
  protected:
   friend class RenderWidgetHostView;
 
diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index 378f7e5..fbdaf26 100644
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -898,16 +898,8 @@ void EWebView::SetTouchEventsEnabled(bool enabled) {
 
   touch_events_enabled_ = enabled;
 
-#if defined(EWK_REFACTOR)
-  if (enabled) {
-    GetEvasEventHandler()->UnbindMouseEventHandlers();
-    GetEvasEventHandler()->BindTouchEventHandlers();
-  } else {
-    // TODO(sns.park): Why not call BindMouseEventHandlers()?
-    // I think it should be called to be symmetric with "enabled" case
-    GetEvasEventHandler()->UnbindTouchEventHandlers();
-  }
-#endif
+  if(rwhv())
+    rwhv()->SetTouchEventsEnabled(enabled);
 }
 
 bool EWebView::MouseEventsEnabled() const {
@@ -920,16 +912,8 @@ void EWebView::SetMouseEventsEnabled(bool enabled) {
 
   mouse_events_enabled_ = enabled;
 
-#if defined(EWK_REFACTOR)
-  if (enabled) {
-    GetEvasEventHandler()->UnbindTouchEventHandlers();
-    GetEvasEventHandler()->BindMouseEventHandlers();
-  } else {
-    // TODO(sns.park): Why not call BindTouchEventHandlers()?
-    // I think it should be called to be symmetric with "enabled" case
-    GetEvasEventHandler()->UnbindMouseEventHandlers();
-  }
-#endif
+ if(rwhv())
+    rwhv()->SetTouchEventsEnabled(!enabled);
 }
 
 namespace {
-- 
2.7.4