Revert "[CherryPick] Input Method upversion"

[framework/web/webkit-efl.git] / Source / WebKit2 / UIProcess / API / efl / tizen / Pan.cpp

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/Pan.cpp b/Source/WebKit2/UIProcess/API/efl/tizen/Pan.cpp
index aec51af..f5ce019 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/Pan.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/Pan.cpp
@@ -32,8 +32,8 @@
 using namespace WebCore;
 using namespace WebKit;
 
-Pan::Pan(EwkViewImpl* viewImpl)
-    : m_viewImpl(viewImpl)
+Pan::Pan(Evas_Object* ewkView)
+    : m_ewkView(ewkView)
     , m_panAnimator(0)
     , m_lastPoint()
     , m_currentPoint()
@@ -41,9 +41,10 @@ Pan::Pan(EwkViewImpl* viewImpl)
     , m_smoothAlgorithm(SmoothAlgorithm::create())
 #endif
 {
+    m_viewImpl = EwkViewImpl::fromEvasObject(m_ewkView);
 #if ENABLE(TIZEN_GESTURE_FEATURE)
-    evas_object_event_callback_add(m_viewImpl->view(), EVAS_CALLBACK_MOUSE_DOWN, onMouseDown, this);
-    evas_object_event_callback_add(m_viewImpl->view(), EVAS_CALLBACK_MOUSE_MOVE, onMouseMove, this);
+    evas_object_event_callback_add(m_ewkView, EVAS_CALLBACK_MOUSE_DOWN, onMouseDown, this);
+    evas_object_event_callback_add(m_ewkView, EVAS_CALLBACK_MOUSE_MOVE, onMouseMove, this);
 #endif
 }
 
@@ -52,8 +53,8 @@ Pan::~Pan()
     if (m_panAnimator)
         ecore_animator_del(m_panAnimator);
 #if ENABLE(TIZEN_GESTURE_FEATURE)
-    evas_object_event_callback_del(m_viewImpl->view(), EVAS_CALLBACK_MOUSE_DOWN, onMouseDown);
-    evas_object_event_callback_del(m_viewImpl->view(), EVAS_CALLBACK_MOUSE_MOVE, onMouseMove);
+    evas_object_event_callback_del(m_ewkView, EVAS_CALLBACK_MOUSE_DOWN, onMouseDown);
+    evas_object_event_callback_del(m_ewkView, EVAS_CALLBACK_MOUSE_MOVE, onMouseMove);
 #endif
 }
 
@@ -62,14 +63,14 @@ void Pan::start(const IntPoint& point)
     if (m_panAnimator)
         return;
 
-    PageClientImpl* pageClientImpl = m_viewImpl->pageClient.get();
+    PageClientImpl* pageClientImpl = ewkViewGetPageClient(m_ewkView);
     EINA_SAFETY_ON_NULL_RETURN(pageClientImpl);
 
 #if ENABLE(TIZEN_CSS_OVERFLOW_SCROLL_ACCELERATION)
     pageClientImpl->findScrollableNode(point);
 #endif
 
-    ewkViewClearEdges(m_viewImpl->view());
+    ewkViewClearEdges(pageClientImpl->viewWidget());
     // Below statement means the update() was not called before start().
     if (m_lastPoint == IntPoint::zero())
         m_lastPoint = point;
@@ -97,7 +98,7 @@ void Pan::stop()
         m_panAnimator = 0;
 
 #if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
-    PageClientImpl* pageClientImpl = m_viewImpl->pageClient.get();
+    PageClientImpl* pageClientImpl = ewkViewGetPageClient(m_ewkView);
     EINA_SAFETY_ON_NULL_RETURN(pageClientImpl);
     pageClientImpl->updateTextSelectionHandlesAndContextMenu(true);
 #endif
@@ -119,22 +120,22 @@ void Pan::process()
     int deltaX = m_lastPoint.x() - m_currentPoint.x();
     int deltaY = m_lastPoint.y() - m_currentPoint.y();
 
-    PageClientImpl* pageClientImpl = m_viewImpl->pageClient.get();
+    PageClientImpl* pageClientImpl = ewkViewGetPageClient(m_ewkView);
     EINA_SAFETY_ON_NULL_RETURN(pageClientImpl);
 
     if (!deltaX && !deltaY)
         return;
 
-    ewkViewSendScrollEvent(m_viewImpl->view(), deltaX, deltaY);
-    if (ewk_view_horizontal_panning_hold_get(m_viewImpl->view()))
+    ewkViewSendScrollEvent(m_ewkView, deltaX, deltaY);
+    if (ewk_view_horizontal_panning_hold_get(m_ewkView))
         deltaX = 0;
-    if (ewk_view_vertical_panning_hold_get(m_viewImpl->view()))
+    if (ewk_view_vertical_panning_hold_get(m_ewkView))
         deltaY = 0;
 
     // Get scrollPosition before scrolling.
     IntPoint scrollPosition = pageClientImpl->scrollPosition();
-    if (WKPageScrollBy(toAPI(m_viewImpl->page()), toAPI(IntSize(deltaX, deltaY))))
-        ewkViewSendEdgeEvent(m_viewImpl->view(), scrollPosition, deltaX, deltaY);
+    if (WKPageScrollBy(toAPI(pageClientImpl->page()), toAPI(IntSize(deltaX, deltaY))))
+        ewkViewSendEdgeEvent(pageClientImpl->viewWidget(), scrollPosition, deltaX, deltaY);
 #if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
     pageClientImpl->updateTextSelectionHandlesAndContextMenu(false, true);
 #endif