X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontrols%2FFWebCtrl_WebImpl.cpp;h=d2e075cb52bc777674bd059a5f177f06557eab13;hb=8c5dbff0c50b0ca4670358ff63ad19c74b8f321a;hp=0b8d1aab58a6d68dced6ebd65a767a1c063aa338;hpb=2cc041e6fcc0fafee905590c610aac480a51667c;p=framework%2Fosp%2Fweb.git

diff --git a/src/controls/FWebCtrl_WebImpl.cpp b/src/controls/FWebCtrl_WebImpl.cpp
index 0b8d1aa..d2e075c 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;
 }
 
@@ -2554,12 +2556,12 @@ _WebImpl::EvaluateJavascriptN(const String& scriptCode)
 
 	ewk_view_script_execute(pView, pScript.get(), OnScriptExecuted, pPresenter.get());
 
-	std::unique_ptr<String> pResult(new (std::nothrow) String(L""));
-	SysTryReturn(NID_WEB_CTRL, pResult.get(), null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
+	String* pResult = new (std::nothrow) String(L"");
+	SysTryReturn(NID_WEB_CTRL, pResult, null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
-	pPresenter->WaitAsyncProcess(*pResult.get());
+	pPresenter->WaitAsyncProcess(*pResult);
 
-	return pResult.release();
+	return pResult;
 }
 
 
@@ -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)
 		{
@@ -4891,6 +4901,8 @@ _WebImpl::OnAncestorVisibleStateChanged(const _Control& control)
 void
 _WebImpl::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
 {
+	_ContainerImpl::OnUserEventReceivedN(requestId, pArgs);
+	
 	switch (requestId)
 	{
 	case ID_CERTIFICATE_CONFIRM_POPUP_CLOSE:
@@ -4917,6 +4929,8 @@ _WebImpl::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::ILi
 	default:
 		break;
 	}
+
+	Resume();
 }
 
 
@@ -4932,6 +4946,8 @@ _WebImpl::HideColorPicker(void)
 {
 	__pColorPicker.reset();
 
+	Resume();
+
 	return EINA_TRUE;
 }
 
@@ -4963,6 +4979,7 @@ CATCH:
 	if (__pColorPicker)
 	{
 		__pColorPicker.reset();
+		Resume();
 	}
 
 	return r;
@@ -4994,6 +5011,7 @@ CATCH:
 	if (__pDatePicker)
 	{
 		__pDatePicker.reset();
+		Resume();
 	}
 
 	return r;