fix build error

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

diff --git a/src/controls/FWebCtrl_UserConfirmPopup.cpp b/src/controls/FWebCtrl_UserConfirmPopup.cpp
index ee89051..ef242a3 100755 (executable)
--- a/src/controls/FWebCtrl_UserConfirmPopup.cpp
+++ b/src/controls/FWebCtrl_UserConfirmPopup.cpp
@@ -349,11 +349,6 @@ _UserConfirmPopup::OnActionPerformed(const Control& source, int actionId)
                        __pImpl->SendUserEvent(ID_USER_SCRIPT_CONFIRM_CLOSE, null);
                        break;
                }
-               case USER_CONFIRM_SAVE_PASSWORD:
-               {
-                       __pImpl->SendUserEvent(ID_USER_CONFIRM_SAVE_PASSWORD_CLOSE, null);
-                       break;
-               }
                default:
                        SysAssert(false);
                }
@@ -474,19 +469,6 @@ CATCH:
                ewk_view_javascript_confirm_reply(pView, allow);
                break;
        }
-       case USER_CONFIRM_SAVE_PASSWORD:
-       {
-               Evas_Object* pView = reinterpret_cast< Evas_Object* >(__pUserPolicyData);
-               if (allow)
-               {
-                       ewk_view_password_confirm_popup_reply(pView, EWK_PASSWORD_POPUP_OK);
-               }
-               else
-               {
-                       ewk_view_password_confirm_popup_reply(pView, EWK_PASSWORD_POPUP_CANCEL);
-               }
-               break;
-       }
        case USER_CONFIRM_APP_CACHE:
        {
                Evas_Object *pObj = reinterpret_cast< Evas_Object* >(__pUserPolicyData);
@@ -660,11 +642,6 @@ _UserConfirmPopup::OnKeyReleased(Control& source, const KeyEventInfo& keyEventIn
                        __pImpl->SendUserEvent(ID_USER_SCRIPT_CONFIRM_CLOSE, null);
                        break;
                }
-               case USER_CONFIRM_SAVE_PASSWORD:
-               {
-                       __pImpl->SendUserEvent(ID_USER_CONFIRM_SAVE_PASSWORD_CLOSE, null);
-                       break;
-               }
                case USER_PROTOCOL_HANDLER:
                case USER_CONTENT_HANDLER:
                case USER_CONFIRM_APP_CACHE:

diff --git a/src/controls/FWebCtrl_WebImpl.cpp b/src/controls/FWebCtrl_WebImpl.cpp
index ac7477a..b491b5e 100755 (executable)
--- a/src/controls/FWebCtrl_WebImpl.cpp
+++ b/src/controls/FWebCtrl_WebImpl.cpp
@@ -379,27 +379,6 @@ CATCH:
 }
 
 
-Eina_Bool
-OnSavePasswordConfirmRequested(Evas_Object* pWebview, const char* pMessage, void* pUserData)
-{
-       SysLog(NID_WEB_CTRL, "The current value of message is %s", pMessage);
-
-       result r = E_SUCCESS;
-       _WebImpl* pImpl = reinterpret_cast< _WebImpl* >(pUserData);
-
-       String msg(pMessage);
-
-       r = pImpl->ShowUserConfirmPopupAsync(USER_CONFIRM_SAVE_PASSWORD, pWebview, msg);
-       SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
-       return EINA_TRUE;
-
-CATCH:
-       ewk_view_password_confirm_popup_reply(pWebview, EWK_PASSWORD_POPUP_CANCEL);
-
-       return EINA_TRUE;
-}
-
-
 void
 OnCertificateRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
 {
@@ -993,15 +972,8 @@ OnLoadingRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
        String uriScheme(uri.GetScheme());
        SysSecureLog(NID_WEB_CTRL, "The current value of scheme is %ls", uriScheme.GetPointer());
 
-       if ((uriScheme != L"http") && (uriScheme != L"https") && (uriScheme != L"file"))
+       if ((uriScheme != L"http") && (uriScheme != L"https") && (uriScheme != L"file") && (uriScheme != L""))
        {
-               ewk_policy_decision_ignore(pPolicy);
-
-               if (uriScheme == L"")
-               {
-                       return;
-               }
-
                result r = E_SUCCESS;
 
                if (uriScheme == L"tel")
@@ -1019,9 +991,13 @@ OnLoadingRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
                        String operationId(L"http://tizen.org/appcontrol/operation/view");
                        r = _AppControlImpl::FindAndStart(operationId, &url, null, null, null, null);
                }
-               SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
-               return;
+               if (r == E_SUCCESS)
+               {
+                       ewk_policy_decision_ignore(pPolicy);
+
+                       return;
+               }
        }
 
        ewk_policy_decision_use(pPolicy);
@@ -1333,7 +1309,6 @@ OnLoadingCompleted(void* pUserData, Evas_Object* pView, void* pEventInfo)
                SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
                pEventArg.release();
        }
-
 }
 
 
@@ -1812,6 +1787,13 @@ OnWebNativeNodeFocusGained(void* pUserData, Evas* pCanvas, Evas_Object* pView, v
        {
                pImpl->SetKeypadOpened(false);
        }
+       if (pImpl->IsWinFocusLost() == true)
+       {
+               _Web* pWebCore = dynamic_cast< _Web* >(&(pImpl->GetCore()));
+               SysAssertf(pWebCore, "Failed to get Web core object");
+
+               evas_object_focus_set(pWebCore->GetWebNativeNode(), EINA_FALSE);
+       }
 }
 
 
@@ -2218,7 +2200,6 @@ _WebImpl::_WebImpl(Web* pWeb, Tizen::Ui::_Control* pCore)
        , __pDbQuotaConfirmPopup(null)
        , __pLocalFsQuotaConfirmPopup(null)
        , __pIndexedDbQuotaConfirmPopup(null)
-       , __pSavePasswordConfirmPopup(null)
        , __pPromptPopup(null)
        , __pCertConfirmPopup(null)
        , __pSelectBox(null)
@@ -3656,8 +3637,6 @@ _WebImpl::SetEventListenerCallback(void) const
                ewk_view_exceeded_database_quota_callback_set(pWebNativeNode, OnDatabaseQuotaExceeded, const_cast< _WebImpl* >(this));
                ewk_view_exceeded_local_file_system_quota_callback_set(pWebNativeNode, OnLocalFileSystemQuotaExceeded, const_cast< _WebImpl* >(this));
 
-               ewk_view_password_confirm_popup_callback_set(pWebNativeNode, OnSavePasswordConfirmRequested, const_cast< _WebImpl* >(this));
-
                evas_object_event_callback_add(pWebNativeNode, EVAS_CALLBACK_FOCUS_IN, OnWebNativeNodeFocusGained, this);
                evas_object_event_callback_add(pWebNativeNode, EVAS_CALLBACK_FOCUS_OUT, OnWebNativeNodeFocusLost, this);
        }
@@ -3746,8 +3725,6 @@ _WebImpl::RemoveEventListenerCallback(void) const
                ewk_view_exceeded_database_quota_callback_set(pWebNativeNode, null, null);
                ewk_view_exceeded_local_file_system_quota_callback_set(pWebNativeNode, null, null);
 
-               ewk_view_password_confirm_popup_callback_set(pWebNativeNode, null, null);
-
                evas_object_event_callback_del(pWebNativeNode, EVAS_CALLBACK_FOCUS_IN, OnWebNativeNodeFocusGained);
                evas_object_event_callback_del(pWebNativeNode, EVAS_CALLBACK_FOCUS_OUT, OnWebNativeNodeFocusLost);
        }
@@ -5070,9 +5047,6 @@ _WebImpl::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::ILi
        case ID_USER_SCRIPT_CONFIRM_CLOSE:
                __pScriptConfirmPopup.reset();
                break;
-       case ID_USER_CONFIRM_SAVE_PASSWORD_CLOSE:
-               __pSavePasswordConfirmPopup.reset();
-               break;
        case ID_USER_SCRIPT_SELECTBOX_CLOSE:
                __pSelectBox.reset();
                break;

diff --git a/src/controls/inc/FWebCtrl_UserConfirmPopup.h b/src/controls/inc/FWebCtrl_UserConfirmPopup.h
index d8faef8..72352a5 100755 (executable)
--- a/src/controls/inc/FWebCtrl_UserConfirmPopup.h
+++ b/src/controls/inc/FWebCtrl_UserConfirmPopup.h
@@ -53,7 +53,6 @@ enum _UserConfirmMode
        USER_CONFIRM_NOTIFICATION,
        USER_SCRIPT_ALERT,
        USER_SCRIPT_CONFIRM,
-       USER_CONFIRM_SAVE_PASSWORD,
        USER_CONFIRM_APP_CACHE,
        USER_CONFIRM_DB_QUOTA_EXCEDED,
        USER_CONFIRM_LOCAL_FS_QUOTA_EXCEDED,

diff --git a/src/controls/inc/FWebCtrl_WebImpl.h b/src/controls/inc/FWebCtrl_WebImpl.h
index b8560e2..f90a77a 100755 (executable)
--- a/src/controls/inc/FWebCtrl_WebImpl.h
+++ b/src/controls/inc/FWebCtrl_WebImpl.h
@@ -138,7 +138,6 @@ enum _WebPopupCloseId
        ID_USER_CONFIRM_NOTIFICATION_CLOSE,
        ID_USER_SCRIPT_ALERT_CLOSE,
        ID_USER_SCRIPT_CONFIRM_CLOSE,
-       ID_USER_CONFIRM_SAVE_PASSWORD_CLOSE,
        ID_USER_SCRIPT_SELECTBOX_CLOSE
 };
 
@@ -497,7 +496,6 @@ private:
        std::unique_ptr<_UserConfirmPopup> __pDbQuotaConfirmPopup;
        std::unique_ptr<_UserConfirmPopup> __pLocalFsQuotaConfirmPopup;
        std::unique_ptr<_UserConfirmPopup> __pIndexedDbQuotaConfirmPopup;
-       std::unique_ptr<_UserConfirmPopup> __pSavePasswordConfirmPopup;
        
        std::unique_ptr< _PromptPopup > __pPromptPopup;
        std::unique_ptr<_CertificateConfirmPopup>  __pCertConfirmPopup;