Separated sync and async popup implementations

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

diff --git a/src/controls/FWebCtrl_WebImpl.cpp b/src/controls/FWebCtrl_WebImpl.cpp
index dd93fda..0aa1622 100755 (executable)
--- a/src/controls/FWebCtrl_WebImpl.cpp
+++ b/src/controls/FWebCtrl_WebImpl.cpp
@@ -436,7 +436,7 @@ OnCertificateRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
 
                result r = E_SUCCESS;
 
-               r = pImpl->ShowUserConfirmPopup(USER_CONFIRM_CERTIFICATE, pEventInfo);
+               r = pImpl->ShowCertificateConfirmPopup(CERTIFICATE_POPUP_MODE_USER_CONFIRM, pPolicy);
                SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
                pImpl->SetCertificateRequested(true);
@@ -535,7 +535,7 @@ OnGeolocationPermissionRequested(void* pUserData, Evas_Object* pView, void* pEve
                {
                        ewk_geolocation_permission_request_suspend(pPermissionRequest);
 
-                       r = pImpl->ShowGeolocationPopup(pPermissionRequest);
+                       r = pImpl->ShowUserConfirmPopupAsync(USER_CONFIRM_GEOLOCATION, pPermissionRequest);
                        SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
                }
 
@@ -1843,7 +1843,7 @@ _WebImpl::_WebImpl(Web* pWeb, Tizen::Ui::_Control* pCore)
        , __pAuthChallenge(null)
        , __pAuthPopup(null)
        , __pUserConfirmPopup(null)
-       , __pGeolocationPopup(null)
+       , __pCertConfirmPopup(null)
        , __pSelectBox(null)
        , __pDatePicker(null)
        , __pColorPicker(null)
@@ -4158,56 +4158,29 @@ CATCH:
 
 
 result
-_WebImpl::ShowGeolocationPopup(Ewk_Geolocation_Permission_Request* pPermissionRequest)
+_WebImpl::ShowCertificateConfirmPopup(_CertificatePopupMode userConfirmMode, Ewk_Certificate_Policy_Decision* pPolicy)
 {
        result r = E_SUCCESS;
 
-       std::unique_ptr<_GeolocationConfirmPopup> pGeolocationPopup(new (std::nothrow) _GeolocationConfirmPopup());
-       SysTryReturnResult(NID_WEB_CTRL, pGeolocationPopup.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
+       std::unique_ptr<_CertificateConfirmPopup> pCertConfirmPopup(new (std::nothrow) _CertificateConfirmPopup());
+       SysTryReturnResult(NID_WEB_CTRL, pCertConfirmPopup.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
 
-       r = pGeolocationPopup->Construct(pPermissionRequest);
+       r = pCertConfirmPopup->Construct(userConfirmMode, pPolicy);
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       __pGeolocationPopup = std::move(pGeolocationPopup);
-
-       r = __pGeolocationPopup->ShowPopup();
-       SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
-
-       __pGeolocationPopup.release();
-
-       return E_SUCCESS;
-
-CATCH:
-       __pGeolocationPopup.reset();
-
-       return r;
-}
-
-
-result
-_WebImpl::ShowUserConfirmPopup(_UserConfirmMode userConfirmMode, void* pPolicy)
-{
-       result r = E_SUCCESS;
-
-       std::unique_ptr<_UserConfirmPopup> pUserConfirmPopup(new (std::nothrow) _UserConfirmPopup());
-       SysTryReturnResult(NID_WEB_CTRL, pUserConfirmPopup.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
-
-       r = pUserConfirmPopup->Construct(userConfirmMode, pPolicy, true);
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       __pUserConfirmPopup = std::move(pUserConfirmPopup);
+       __pCertConfirmPopup = std::move(pCertConfirmPopup);
 
        int modalResult = 0;
-       r = __pUserConfirmPopup->ShowAndWait(modalResult);
+       r = __pCertConfirmPopup->ShowAndWait(modalResult);
        SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       if (userConfirmMode == USER_CONFIRM_CERTIFICATE)
+       if (userConfirmMode == CERTIFICATE_POPUP_MODE_USER_CONFIRM)
        {
-               __isCertificateConfirmed = __pUserConfirmPopup->GetConfirmResult();
+               __isCertificateConfirmed = __pCertConfirmPopup->GetConfirmResult();
        }
 
 CATCH:
-       __pUserConfirmPopup.reset();
+       __pCertConfirmPopup.reset();
 
        return r;
 }
@@ -4221,7 +4194,7 @@ _WebImpl::ShowUserConfirmPopupAsync(_UserConfirmMode userConfirmMode, void* pPol
        std::unique_ptr<_UserConfirmPopup> pUserConfirmPopup(new (std::nothrow) _UserConfirmPopup());
        SysTryReturnResult(NID_WEB_CTRL, pUserConfirmPopup.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
 
-       r = pUserConfirmPopup->Construct(userConfirmMode, pPolicy, false);
+       r = pUserConfirmPopup->Construct(userConfirmMode, pPolicy);
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        __pUserConfirmPopup = std::move(pUserConfirmPopup);