refactoring text selection module

[framework/osp/web.git] / src / controls / FWebCtrl_Web.cpp

diff --git a/src/controls/FWebCtrl_Web.cpp b/src/controls/FWebCtrl_Web.cpp
index e946f6a..f745983 100755 (executable)
--- a/src/controls/FWebCtrl_Web.cpp
+++ b/src/controls/FWebCtrl_Web.cpp
@@ -122,6 +122,7 @@ _Web::_Web(void)
        : __gestureType(WEB_GESTURE_TYPE_TAP)
        , __pGestureHandler(null)
        , __pEflWebkit(null)
+       , __pWebSetting(null)
        , __pGestureFlick(null)
        , __pGestureLongPress(null)
        , __pGesturePinch(null)
@@ -150,6 +151,9 @@ _Web::CreateWebN(void)
        std::unique_ptr<_Web> pWeb(new (std::nothrow) _Web());
        SysTryReturn(NID_WEB_CTRL, pWeb.get(), null, E_OUT_OF_MEMORY, "[%s] Memory Allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
+       pWeb->__pWebSetting = std::unique_ptr<WebSetting>(new (std::nothrow) WebSetting());
+       SysTryReturn(NID_WEB_CTRL, pWeb->__pWebSetting.get(), null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
+
        pWeb->AcquireHandle();
        pWeb->SetMultiTouchEnabled(true);
        pWeb->SetTouchPressThreshold(0.08);
@@ -345,17 +349,10 @@ _Web::GetWebNativeNode(void)
 }
 
 
-void 
-_Web::SetWebSettingImpl(_WebSettingImpl* pWebSettingImpl)
-{
-       __pWebSettingImpl = pWebSettingImpl;
-}
-
-
-_WebSettingImpl* 
-_Web::GetWebSettingImpl(void) const
+WebSetting*
+_Web::GetSetting(void) const
 {
-       return __pWebSettingImpl;
+       return __pWebSetting.get();
 }
 
 
@@ -438,7 +435,7 @@ _Web::OnTouchPressed(const _Control& source, const _TouchInfo& touchInfo)
 bool
 _Web::OnTouchMoved(const _Control& source, const _TouchInfo& touchInfo)
 {
-       if (__pEflWebkit.get() && __pWebSettingImpl->IsScrollEnabled())
+       if (__pEflWebkit.get() && _WebSettingImpl::GetInstance(__pWebSetting.get())->IsScrollEnabled())
        {
                SendTouchEventForJavaScript(touchInfo);
 
@@ -457,13 +454,6 @@ _Web::OnTouchReleased(const _Control& source, const _TouchInfo& touchInfo)
                SendTouchEventForJavaScript(touchInfo);
 
                return __pGestureHandler->OnTouchReleased(source, touchInfo);
-
-               _WebImpl* pWebImpl = reinterpret_cast<_WebImpl*>(evas_object_data_get(GetWebNativeNode(), WEB_CTRL));
-
-               if (pWebImpl->GetLoadingListener() && pWebImpl->GetTextFromBlock().GetLength() > 0)
-               {
-                       pWebImpl->FireWebPageBlockSelectedEvent();
-               }
        }
 
        SetFocused();
@@ -551,7 +541,7 @@ _Web::OnTapGestureCanceled(_TouchTapGestureDetector& gesture)
 bool
 _Web::OnFlickGestureDetected(_TouchFlickGestureDetector& gesture)
 {
-       if (__pEflWebkit.get() && __pWebSettingImpl->IsScrollEnabled())
+       if (__pEflWebkit.get() && _WebSettingImpl::GetInstance(__pWebSetting.get())->IsScrollEnabled())
        {
                return __pFlickGestureHandler->OnFlickGestureDetected(gesture);
        }