From: Seongjun Yim <se201.yim@samsung.com>
Date: Mon, 5 Aug 2013 08:37:46 +0000 (+0900)
Subject: fix blocking popup issue
X-Git-Tag: submit/tizen_2.2/20131107.062229~63
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=277846b942a78112511e8850841768af466b9ae2;p=framework%2Fosp%2Fweb.git

fix blocking popup issue

Change-Id: Ib9317527c196b8f3959c9708bdf2218b1d148759
Signed-off-by: Seongjun Yim <se201.yim@samsung.com>
---

diff --git a/src/controls/FWebCtrl_WebImpl.cpp b/src/controls/FWebCtrl_WebImpl.cpp
index 46bf5a8..c1c956b 100755
--- a/src/controls/FWebCtrl_WebImpl.cpp
+++ b/src/controls/FWebCtrl_WebImpl.cpp
@@ -1733,7 +1733,7 @@ OnWebNativeNodeFocusGained(void* pUserData, Evas* pCanvas, Evas_Object* pView, v
 
 	if (pImpl->IsKeypadOpened() == true)
 	{
-		pImpl->SetKeypadOpened(false);	
+		pImpl->SetKeypadOpened(false);
 	}
 } 
 
@@ -2453,6 +2453,8 @@ _WebImpl::ClearSelectBoxPopup(void)
 
 	__pSelectBox.reset();
 
+	Resume();
+
 	return E_SUCCESS;
 }
 
@@ -2759,6 +2761,10 @@ _WebImpl::SynchronizeSearch(_SearchType type, Evas_Object* pView, Ewk_Find_Optio
 	std::unique_ptr<char[]> pText(_StringConverter::CopyToCharArrayN(text));
 	SysTryReturn(NID_WEB_CTRL, pText.get(), GetLastResult(), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
+	Ewk_Settings* pSettings = ewk_view_settings_get(__pWebCore->GetWebNativeNode());
+	SysAssertf(pSettings, "Failed to get webkit instance.");
+	ewk_settings_clear_text_selection_automatically_set(pSettings, true);
+
 	switch (type)
 	{
 	case SEARCH_SYNC:
@@ -3678,6 +3684,10 @@ _WebImpl::SetBlockSelectionPosition(const FloatPoint& startPoint)
 	{
 		Point absPoint( _CoordinateSystemUtils::ConvertToInteger(__pWebCore->GetAbsoluteCoordinate(startPoint)));
 
+		Ewk_Settings* pSettings = ewk_view_settings_get(__pWebCore->GetWebNativeNode());
+		SysAssertf(pSettings, "Failed to get webkit instance.");
+		ewk_settings_clear_text_selection_automatically_set(pSettings, true);
+
 		Eina_Bool ret = pSmartData->api->text_selection_down(pSmartData, absPoint.x, absPoint.y);
 		if (ret)
 		{
@@ -4919,6 +4929,8 @@ _WebImpl::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::ILi
 	default:
 		break;
 	}
+
+	Resume();
 }
 
 
@@ -4934,6 +4946,8 @@ _WebImpl::HideColorPicker(void)
 {
 	__pColorPicker.reset();
 
+	Resume();
+
 	return EINA_TRUE;
 }
 
@@ -4965,6 +4979,7 @@ CATCH:
 	if (__pColorPicker)
 	{
 		__pColorPicker.reset();
+		Resume();
 	}
 
 	return r;
@@ -4996,6 +5011,7 @@ CATCH:
 	if (__pDatePicker)
 	{
 		__pDatePicker.reset();
+		Resume();
 	}
 
 	return r;