improve the logic to make a header
[framework/osp/web.git] / src / controls / FWebCtrl_WebImpl.cpp
index 4d61922..2b78f55 100755 (executable)
@@ -37,7 +37,6 @@
 #include <FBaseRtMutexGuard.h>
 #include <FBaseSysLog.h>
 #include <FBaseUtilUri.h>
-#include <FCntDownloadRequest.h>
 #include <FGrpColor.h>
 #include <FGrpPoint.h>
 #include <FGrpRectangle.h>
 #include <FApp_AppInfo.h>
 #include <FApp_AppManagerImpl.h>
 #include <FBase_StringConverter.h>
-#include <FCnt_DownloadManagerImpl.h>
 #include <FGrp_CoordinateSystem.h>
 #include <FGrp_Screen.h>
 #include <FIo_DatabaseImpl.h>
 #include <FIo_NormalFile.h>
+#include <FSys_SystemResource.h>
 #include <FSys_VibratorImpl.h>
 #include <FUi_Control.h>
 #include <FUi_CoordinateSystemUtils.h>
@@ -85,7 +84,7 @@
 #include <FUiAnim_EflNode.h>
 #include <FUiAnim_VisualElement.h>
 #include <FUiCtrl_FooterImpl.h>
-#include <FUiCtrl_Form.h>
+#include <FUiCtrl_FormImpl.h>
 #include "FWeb_HistoryItemImpl.h"
 #include "FWebCtrl_AppControlListener.h"
 #include "FWebCtrl_AuthConfirmPopup.h"
 #include "FWebCtrl_WebEvent.h"
 #include "FWebCtrl_WebEventArg.h"
 #include "FWebCtrl_WebImpl.h"
+#include "FWebCtrl_WebManager.h"
 #include "FWebCtrl_WebPresenter.h"
 #include "FWebCtrl_WebSettingImpl.h"
 
@@ -150,23 +150,6 @@ static const int DEFAULT_LIST_ITEM_COUNT = 4;
 
 
 Eina_Bool
-AddHttpHeaderData(const Eina_Hash* pHash, const void* pKey, void* pValue, void* pUserData)
-{
-       result r = E_SUCCESS;
-
-       String key(reinterpret_cast< const char* >(pKey));
-       String value(reinterpret_cast< char* >(pValue));
-
-       SysLog(NID_WEB_CTRL, "The current value of key is %ls, value is %ls", key.GetPointer(), value.GetPointer());
-
-       r = reinterpret_cast< HttpHeader* >(pUserData)->AddField(key, value);
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, EINA_FALSE, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       return EINA_TRUE;
-}
-
-
-Eina_Bool
 AddHttpAttributeData(const Eina_Hash* pHash, const void* pKey, void* pValue, void* pUserData)
 {
        result r = E_SUCCESS;
@@ -362,26 +345,12 @@ OnScriptConfirmRequested(Evas_Object* pView, const char* pMessage, void* pUserDa
        _WebImpl* pImpl = reinterpret_cast< _WebImpl* >(pUserData);
        String msg(pMessage);
 
-       MessageBox messageBox;
-       r = messageBox.Construct(L"", msg, MSGBOX_STYLE_OKCANCEL);
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, EINA_FALSE, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       int modalResult = 0;
-
-       messageBox.SetOwner(&pImpl->GetPublic());
-
-       r = messageBox.ShowAndWait(modalResult);
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, EINA_FALSE, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       if (modalResult == MSGBOX_RESULT_OK)
-       {
-               ewk_view_javascript_confirm_reply(pView, EINA_TRUE);
-       }
-       else
-       {
-               ewk_view_javascript_confirm_reply(pView, EINA_FALSE);
-       }
+       r = pImpl->ShowUserConfirmPopupAsync(USER_SCRIPT_CONFIRM, pView, msg);
+       SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+       return EINA_TRUE;
 
+CATCH:
+       ewk_view_javascript_confirm_reply(pView, EINA_FALSE);
        return EINA_TRUE;
 }
 
@@ -416,6 +385,8 @@ OnCertificateRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
        Ewk_Certificate_Policy_Decision* pPolicy = reinterpret_cast< Ewk_Certificate_Policy_Decision* >(pEventInfo);
        SysAssertf(pImpl && pPolicy, "Failed to request");
 
+       _Web* pWebCore = dynamic_cast< _Web* >(&(pImpl->GetCore()));
+
        switch (pImpl->GetSetting().GetCertificateErrorHandlingMode())
        {
        case WEB_CERTIFICATE_ERROR_HANDLING_MODE_USER_CONFIRM:
@@ -458,9 +429,14 @@ OnCertificateRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
                {
                        r = pImpl->ShowCertificateConfirmPopup(CERTIFICATE_POPUP_MODE_USER_CONFIRM, pPolicy);
                        SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+
+                       ewk_view_resume(pWebCore->GetWebNativeNode());
                }
 
-               pImpl->SetCertificateRequested(true);
+               if (pImpl)
+               {
+                       pImpl->SetCertificateRequested(true);
+               }
                break;
        }
        case WEB_CERTIFICATE_ERROR_HANDLING_MODE_CANCEL:
@@ -479,6 +455,8 @@ CATCH:
        ewk_certificate_policy_decision_allowed_set(pPolicy, EINA_FALSE);
        pImpl->SetCertificateConfirmed(false);
        pImpl->SetCertificateRequested(true);
+
+       ewk_view_resume(pWebCore->GetWebNativeNode());
 }
 
 
@@ -705,7 +683,7 @@ OnNotificationShow(void* pUserData, Evas_Object* pView, void* pEventInfo)
 
        pNotificationWindow->SetText(String(text));
        pNotificationWindow->LaunchNotification();
-       pNotificationWindow.release();
+       pImpl->SetWebNotification(pNotificationWindow.release());
 
        ewk_notification_showed(pContext, notificationId);
 }
@@ -831,6 +809,58 @@ OnContentHandlerUnregistrationRequested(void* pUserData, Evas_Object* pView, voi
 
 
 void
+OnFullScreenEntered(void* pUserData, Evas_Object* pView, void* pEventInfo)
+{
+       _WebImpl* pImpl = reinterpret_cast<_WebImpl*>(pUserData);
+       bool* pIsHandleNeeded = reinterpret_cast< bool* >(pEventInfo);
+       SysAssertf(pImpl, "Failed to request");
+
+       _Web* pWebCore = dynamic_cast< _Web* >(&(pImpl->GetCore()));
+       SysAssertf(pWebCore, "Failed to get Web core object");
+
+       if (pIsHandleNeeded && *pIsHandleNeeded)
+       {
+               pWebCore->SetFullScreenEntered(true);
+       }
+}
+
+
+void
+OnFullScreenExited(void* pUserData, Evas_Object* pView, void* pEventInfo)
+{
+       _WebImpl* pImpl = reinterpret_cast<_WebImpl*>(pUserData);
+       SysAssertf(pImpl, "Failed to request");
+
+       _Web* pWebCore = dynamic_cast< _Web* >(&(pImpl->GetCore()));
+       SysAssertf(pWebCore, "Failed to get Web core object");
+
+       pWebCore->SetFullScreenEntered(false);
+}
+
+
+void
+OnFocusDownRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
+{
+       _WebImpl* pImpl = reinterpret_cast<_WebImpl*>(pUserData);
+       SysAssertf(pImpl, "Failed to request");
+
+       _Web* pWebCore = dynamic_cast< _Web* >(&(pImpl->GetCore()));
+       pWebCore->SetFocusEnd(true);
+}
+
+
+void
+OnFocusUpRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
+{
+       _WebImpl* pImpl = reinterpret_cast<_WebImpl*>(pUserData);
+       SysAssertf(pImpl, "Failed to request");
+
+       _Web* pWebCore = dynamic_cast< _Web* >(&(pImpl->GetCore()));
+       pWebCore->SetFocusEnd(true);
+}
+
+
+void
 OnVibrationRequested(uint64_t duration, void* pUserData)
 {
        result r = E_SUCCESS;
@@ -863,64 +893,75 @@ OnLoadingRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
        String url(ewk_policy_decision_url_get(pPolicy));
        SysSecureLog(NID_WEB_CTRL, "The current value of url is %ls", url.GetPointer());
 
-       if (url == L"about:blank")
-       {
-               ewk_policy_decision_use(pPolicy);
-               return;
-       }
-
-       if (pImpl->GetLoadingListener() && ewk_frame_is_main_frame(ewk_policy_decision_frame_get(pPolicy))
+       if (ewk_frame_is_main_frame(ewk_policy_decision_frame_get(pPolicy))
                && !pImpl->IsRedirectRequested())
        {
+               _Web* pWebCore = dynamic_cast< _Web* >(&(pImpl->GetCore()));
+               SysAssertf(pWebCore, "Failed to get Web core object");
+
+               pWebCore->SetFullScreenEntered(false);
+
                pImpl->SetCertificateRequested(false);
 
                if (pImpl->GetTextSearchListener())
                {
                        pImpl->DisableAsyncSearch();
                }
-       
-               WebNavigationType navigationType = WEB_NAVIGATION_OTHER;
-               Ewk_Policy_Navigation_Type ewkNavigationType = ewk_policy_decision_navigation_type_get(pPolicy);
 
-               switch (ewkNavigationType)
+               ILoadingListener* pLoadingListener = pImpl->GetLoadingListener();
+               if (pLoadingListener)
                {
-               case EWK_POLICY_NAVIGATION_TYPE_LINK_CLICKED:
-                       navigationType = WEB_NAVIGATION_LINK_CLICKED;
-                       break;
-               case EWK_POLICY_NAVIGATION_TYPE_FORM_SUBMITTED:
-                       navigationType = WEB_NAVIGATION_FORM_SUBMITTED;
-                       break;
-               case EWK_POLICY_NAVIGATION_TYPE_BACK_FORWARD:
-                       navigationType = WEB_NAVIGATION_BACKFORWARD;
-                       break;
-               case EWK_POLICY_NAVIGATION_TYPE_RELOAD:
-                       navigationType = WEB_NAVIGATION_RELOAD;
-                       break;
-               case EWK_POLICY_NAVIGATION_TYPE_FORM_RESUBMITTED:
-                       navigationType = WEB_NAVIGATION_FORM_RESUBMITTED;
-                       break;
-               case EWK_POLICY_NAVIGATION_TYPE_OTHER:
-                       navigationType = WEB_NAVIGATION_OTHER;
-                       break;
-               default:
-                       SysAssert(false);
-               }
+                       WebNavigationType navigationType = WEB_NAVIGATION_OTHER;
+                       Ewk_Policy_Navigation_Type ewkNavigationType = ewk_policy_decision_navigation_type_get(pPolicy);
 
-               if (pImpl->GetLoadingListener()->OnLoadingRequested(url, navigationType))
-               {
-                       ewk_policy_decision_ignore(pPolicy);
+                       switch (ewkNavigationType)
+                       {
+                       case EWK_POLICY_NAVIGATION_TYPE_LINK_CLICKED:
+                               navigationType = WEB_NAVIGATION_LINK_CLICKED;
+                               break;
+                       case EWK_POLICY_NAVIGATION_TYPE_FORM_SUBMITTED:
+                               navigationType = WEB_NAVIGATION_FORM_SUBMITTED;
+                               break;
+                       case EWK_POLICY_NAVIGATION_TYPE_BACK_FORWARD:
+                               navigationType = WEB_NAVIGATION_BACKFORWARD;
+                               break;
+                       case EWK_POLICY_NAVIGATION_TYPE_RELOAD:
+                               navigationType = WEB_NAVIGATION_RELOAD;
+                               break;
+                       case EWK_POLICY_NAVIGATION_TYPE_FORM_RESUBMITTED:
+                               navigationType = WEB_NAVIGATION_FORM_RESUBMITTED;
+                               break;
+                       case EWK_POLICY_NAVIGATION_TYPE_OTHER:
+                               navigationType = WEB_NAVIGATION_OTHER;
+                               break;
+                       default:
+                               SysAssert(false);
+                       }
 
-                       return;
+                       if (pLoadingListener->OnLoadingRequested(url, navigationType))
+                       {
+                               ewk_policy_decision_ignore(pPolicy);
+
+                               return;
+                       }
                }
        }
 
+       if (url == L"about:blank")
+       {
+               ewk_policy_decision_use(pPolicy);
+
+               return;
+       }
+
        String currentUrl(pImpl->GetUrl());
        String redirectUrl(pImpl->GetProtocolFromUri(url,  currentUrl));
        if (redirectUrl != L"")
        {
-               pImpl->LoadUrl(redirectUrl);
                ewk_policy_decision_ignore(pPolicy);
 
+               pImpl->LoadUrl(redirectUrl);
+
                return;
        }
        
@@ -928,7 +969,7 @@ OnLoadingRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
        uri.SetUri(url);
 
        String uriScheme(uri.GetScheme());
-       SysLog(NID_WEB_CTRL, "The current value of scheme is %ls", uriScheme.GetPointer());
+       SysSecureLog(NID_WEB_CTRL, "The current value of scheme is %ls", uriScheme.GetPointer());
 
        if ((uriScheme != L"http") && (uriScheme != L"https") && (uriScheme != L"file"))
        {
@@ -941,35 +982,22 @@ OnLoadingRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
 
                result r = E_SUCCESS;
 
-               _WebEventType eventType = WEB_EVENT_REQUEST_UNKNOWN;
-
-               if (uriScheme == L"rtsp")
-               {
-                       eventType = WEB_EVENT_REQUEST_RTSP;
-               }
-               else if (uriScheme == L"mailto")
+               if (uriScheme == L"tel")
                {
-                       eventType = WEB_EVENT_REQUEST_EMAIL;
+                       String operationId(L"http://tizen.org/appcontrol/operation/dial");
+                       r = _AppControlImpl::FindAndStart(operationId, &url, null, null, null, null);
                }
-               else if (uriScheme == L"tel")
+               else if (uriScheme == L"mailto" || uriScheme == L"sms" || uriScheme == L"smsto" || uriScheme == L"mms" || uriScheme == L"mmsto" )
                {
-                       eventType = WEB_EVENT_REQUEST_TEL;
+                       String operationId(L"http://tizen.org/appcontrol/operation/compose");
+                       r = _AppControlImpl::FindAndStart(operationId, &url, null, null, null, null);
                }
-               else if (uriScheme == L"sms" || uriScheme == L"smsto" )
-               {
-                       eventType = WEB_EVENT_REQUEST_SMS;
-               }
-               else if (uriScheme == L"mms" || uriScheme == L"mmsto" )
+               else
                {
-                       eventType = WEB_EVENT_REQUEST_MMS;
+                       String operationId(L"http://tizen.org/appcontrol/operation/view");
+                       r = _AppControlImpl::FindAndStart(operationId, &url, null, null, null, null);
                }
-
-               std::unique_ptr<_WebEventArg> pEventArg(new _WebEventArg(eventType, url));
-               SysTryReturnVoidResult(NID_WEB_CTRL, pEventArg.get(), E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
-
-               r = pImpl->GetWebEvent()->FireAsync(*pEventArg.get());
                SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-               pEventArg.release();
 
                return;
        }
@@ -1063,34 +1091,49 @@ OnWebDataReceived(void* pUserData, Evas_Object* pView, void* pEventInfo)
 
        result r = E_SUCCESS;
 
-       const char* pUrl = ewk_policy_decision_url_get(pPolicy);
        int code = ewk_policy_decision_response_status_code_get(pPolicy);
-       String mime(ewk_policy_decision_response_mime_get(pPolicy));
-       SysSecureLog(NID_WEB_CTRL, "url : %s, mime : %ls, code : %d", pUrl, mime.GetPointer(), code);
-
-       ILoadingListener* pLoadingListener = pImpl->GetLoadingListener();
-
        String url(ewk_policy_decision_url_get(pPolicy));
+       String mime(ewk_policy_decision_response_mime_get(pPolicy));
+       SysSecureLog(NID_WEB_CTRL, "code : %d, url : %ls, mime : %ls", code, url.GetPointer(), mime.GetPointer());
 
-       
-       if (pLoadingListener && ewk_frame_is_main_frame(ewk_policy_decision_frame_get(pPolicy)))
+       if (ewk_frame_is_main_frame(ewk_policy_decision_frame_get(pPolicy)))
        {
-               const Eina_Hash* pHeader = ewk_policy_decision_response_headers_get(pPolicy);
-
-               DecisionPolicy policy;
-               HttpHeader httpHeader;
-
                if (code >= REDIRECTION_HEADER_GROUP && code < REDIRECTION_HEADER_GROUP + 100)
                {
                        pImpl->SetRedirectRequested(true);
                        mime = L"";
                }
 
-               eina_hash_foreach(pHeader, AddHttpHeaderData, &httpHeader);
-               SysTryCatch(NID_WEB_CTRL, GetLastResult() == E_SUCCESS, , GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
+               ILoadingListener* pLoadingListener = pImpl->GetLoadingListener();
+               if (pLoadingListener)
+               {
+                       HttpHeader httpHeader;
+
+                       Eina_Iterator* iterator = eina_hash_iterator_tuple_new(ewk_policy_decision_response_headers_get(pPolicy));
+                       if (iterator)
+                       {
+                               Eina_Hash_Tuple *tuple = null;
+
+                               EINA_ITERATOR_FOREACH(iterator, tuple)
+                               {
+                                       String key(reinterpret_cast< const char* >(tuple->key));
+                                       String value(reinterpret_cast< char* >(tuple->data));
+
+                                       SysSecureLog(NID_WEB_CTRL, "The current value of key is %ls, value is %ls", key.GetPointer(), value.GetPointer());
+
+                                       r = httpHeader.AddField(key, value);
+                                       SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+                               }
 
-               policy = pLoadingListener->OnWebDataReceived(mime, httpHeader);
-               pImpl->SetPolicyDecision(policy);
+                               eina_iterator_free(iterator);
+                       }
+
+                       pImpl->SetPolicyDecision(pLoadingListener->OnWebDataReceived(mime, httpHeader));
+               }
+               else
+               {
+                       pImpl->SetPolicyDecision(WEB_DECISION_CONTINUE);
+               }
        }
 
        switch (pImpl->GetPolicyDecision())
@@ -1101,82 +1144,30 @@ OnWebDataReceived(void* pUserData, Evas_Object* pView, void* pEventInfo)
                String redirectUrl(pImpl->GetRedirectUri(url, currentUrl, mime));
                if (redirectUrl != L"")
                {
-                       pImpl->LoadUrl(redirectUrl);
                        ewk_policy_decision_ignore(pPolicy);
 
+                       pImpl->LoadUrl(redirectUrl);
+
                        return;
                }
 
-               if (pImpl->IsMimeSupported(mime) || mime == L"")
+               if (ewk_policy_decision_type_get(pPolicy) == EWK_POLICY_DECISION_USE)
                {
                        break;
                }
-               
                else
                {
-                       SysLog(NID_WEB_CTRL, "Launch native app to handle the mime");
-
                        ewk_policy_decision_ignore(pPolicy);
 
-                       AppControl* pAppControl = null;
-                       _SelectBox selectBox;
-                       int appCount = 0;
-                       int selectedIndex = 0;
-
-                       std::unique_ptr<IList, AllElementsDeleter> pList(_AppManagerImpl::FindAppControlsN(NULL, NULL, &mime, NULL));
-
-                       if (pList.get())
-                       {
-                               appCount = pList->GetCount();
-                       }
-
-                       r = selectBox.Construct(false, L"", appCount+1); //+1 for Downloader
-                       SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-
-                       selectBox.AddListItem(L"Download", _SelectBox::LIST_ITEM_TYPE_NORMAL, false);
-                       for (int i = 0; i < appCount; i++)
-                       {
-                               pAppControl = dynamic_cast< AppControl* >(pList->GetAt(i));
-                               SysTryReturnVoidResult(NID_WEB_CTRL, pAppControl, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-                               String text = pAppControl->GetAppName();
-                               SysLog(NID_WEB_CTRL, "AppName : %S", text.GetPointer());
+                       String operationId(L"http://tizen.org/appcontrol/operation/view");
 
-                               selectBox.AddListItem(text, _SelectBox::LIST_ITEM_TYPE_NORMAL, false);
-                       }
-                       r = selectBox.ShowAndWait(selectedIndex);
-                       SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-
-                       if (selectedIndex == 0) //download
-                       {
-                               RequestId reqId = 0;
-                               DownloadRequest request(pUrl);
-
-                               _DownloadManagerImpl* pManagerImpl = _DownloadManagerImpl::GetInstance();
-                               SysTryReturnVoidResult(NID_WEB_CTRL, pManagerImpl, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-                               r = pManagerImpl->Start(request, reqId);
-                               SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-                       }
-                       else if (selectedIndex != -1) // -1 for cancel
+                       r = _AppControlImpl::FindAndStart(operationId, &url, &mime, null, null, null);
+                       SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS || r == E_OBJ_NOT_FOUND, r, "[%s] Propagating.", GetErrorMessage(r));
+                       if (r == E_OBJ_NOT_FOUND)
                        {
-                               String path("path");
-                               String pathVal(pUrl);
+                               String operationId(L"http://tizen.org/appcontrol/operation/download");
 
-                               HashMap dataList;
-                               r = dataList.Construct();
-                               SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-
-                               r = dataList.Add(path, pathVal);
-                               SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-
-                               pAppControl = dynamic_cast< AppControl* >(pList->GetAt(selectedIndex));
-                               SysTryReturnVoidResult(NID_WEB_CTRL, pAppControl, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-                               _AppControlImpl* pAcImpl = _AppControlImpl::GetInstance(*pAppControl);
-                               SysTryReturnVoidResult(NID_WEB_CTRL, pAcImpl, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-                               r = pAcImpl->Start(null, null, &dataList, null);
+                               r = _AppControlImpl::FindAndStart(operationId, &url, null, null, null, null);
                                SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
                        }
 
@@ -1184,6 +1175,7 @@ OnWebDataReceived(void* pUserData, Evas_Object* pView, void* pEventInfo)
                }
                break;
        }
+
        case WEB_DECISION_DOWNLOAD:
        {
                ewk_policy_decision_ignore(pPolicy);
@@ -1194,16 +1186,18 @@ OnWebDataReceived(void* pUserData, Evas_Object* pView, void* pEventInfo)
                Ewk_Context* pContext = ewk_view_context_get(pView);
                SysAssertf(pContext, "Failed to get webkit instance.");
 
-               pDownloadHandler->StartDownload(pUrl);
+               pDownloadHandler->StartDownload(url);
 
                return;
        }
+
        case WEB_DECISION_IGNORE:
        {
                ewk_policy_decision_ignore(pPolicy);
 
                return;
        }
+
        default:
        {
                SysAssert(false);
@@ -1568,7 +1562,6 @@ FireWebPageBlockSelectedEventF(_WebImpl* pImpl)
        SysTryReturnResult(NID_WEB_CTRL, startPoint.get() && endPoint.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
 
        pImpl->GetBlockRange(*startPoint.get(), *endPoint.get());
-
        if ((endPoint->x != 0.0f) && (endPoint->y != 0.0f))
        {
                std::unique_ptr<_WebUiEventArg> pEventArg(new (std::nothrow) _WebUiEventArg(WEB_EVENT_WEBUIEVENTLISTENER_PAGE_BLOCK_SELECTED_FLOAT));
@@ -1615,112 +1608,6 @@ OnWebPageBlockSelected(void* pUserData, Evas_Object* pView, void* pEventInfo)
 
 
 void
-OnWebPageBlockSelectedByOrientation(void* pUserData, Evas_Object* pView, void* pEventInfo)
-{
-       _WebImpl* pImpl = reinterpret_cast< _WebImpl* >(pUserData);
-       SysAssertf(pImpl, "Failed to request");
-
-       if (!pImpl->IsOrientationChanged())
-       {
-               return;
-       }
-
-       pImpl->SetOrientationChanged(false);
-
-       int orientation = 0;
-       _ControlRotation rotation = _ControlManager::GetInstance()->GetOrientationStatus();
-       switch (rotation)
-       {
-               case _CONTROL_ROTATION_0:
-                       orientation =  0;
-                       break;
-               case _CONTROL_ROTATION_90:
-                       orientation =  90;
-                       break;
-               case _CONTROL_ROTATION_180:
-                       orientation =  180;
-                       break;
-               case _CONTROL_ROTATION_270:
-                       orientation =  -90;
-                       break;
-       }
-       ewk_view_orientation_send(pView, orientation);
-
-       OnWebPageBlockSelected(pUserData, pView, pEventInfo);
-}
-
-
-Eina_Bool
-OnSelectUploadFile(Evas_Object* pView, Eina_Bool multipleFile, Eina_List* pAcceptTypes, const char* pCapture, void* pUserData)
-{
-       String isMultipleSelection(L"single");
-       result r = E_SUCCESS;
-
-       HashMap dataList;
-       String mode(L"selectionType");
-       String type(L"type");
-       _AppControlImpl* pMediaAppControlImpl = null;
-
-       int itemCount = 0;
-       String fileType = L"all";
-
-       if (multipleFile)
-       {
-               isMultipleSelection.Append(L"multiple");
-       }
-
-       std::unique_ptr<AppControl> pMediaAppControl(_AppManagerImpl::FindAppControlN(L"tizen.filemanager", L"http://tizen.org/appcontrol/operation/pick"));
-       SysTryReturn(NID_WEB_CTRL, pMediaAppControl.get(), EINA_TRUE, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-       std::unique_ptr<_MediaSelectionListener> pMediaListener(new (std::nothrow) _MediaSelectionListener());
-       SysTryReturn(NID_WEB_CTRL, pMediaListener.get(), EINA_TRUE, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-       pMediaListener->Construct(pView, pMediaAppControl.get());
-
-       itemCount = eina_list_count(pAcceptTypes);
-
-       if (itemCount == 1)
-       {
-               String item((char*)eina_list_nth(pAcceptTypes, 0));
-               if (item.StartsWith("image/",0))
-               {
-                       fileType = L"image";
-               }
-               else if (item.StartsWith("audio/",0))
-               {
-                       fileType = L"audio";
-               }
-               else if (item.StartsWith("video/",0))
-               {
-                       fileType = L"video";
-               }
-       }
-
-       r = dataList.Construct();
-       SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
-
-       r = dataList.Add(mode, isMultipleSelection);
-       SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
-
-       r = dataList.Add(type, fileType);
-       SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
-
-       pMediaAppControlImpl = _AppControlImpl::GetInstance(*pMediaAppControl.get());
-       r = pMediaAppControlImpl->Start(null, null, &dataList, pMediaListener.get());
-       SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
-
-       pMediaListener.release();
-       pMediaAppControl.release();
-
-       return EINA_TRUE;
-
-CATCH:
-       ewk_view_open_panel_reply(pView, null, EINA_FALSE);
-       return EINA_TRUE;
-}
-
-
-void
 OnHandleJavaScriptRequest(void* pUserData, Evas_Object* pView, void* pEventInfo)
 {
        _WebImpl* pImpl = reinterpret_cast< _WebImpl* >(pUserData);
@@ -1762,16 +1649,10 @@ OnWebKeypadStateChanged(void* pUserData, Evas_Object* pView, void* pEventInfo)
                        return;
                }
 
-               _Form* pFormCore = pImpl->GetParentFormCore(dynamic_cast< _Control* >(&pImpl->GetCore()));
-               if (pFormCore)
+               _FormImpl* pFormImpl = pImpl->GetParentFormImpl(dynamic_cast< _ControlImpl* >(pImpl));
+               if (pFormImpl)
                {
-                       if (pFormCore->HasFooter() && pFormCore->IsFooterVisible())
-                       {
-                               pImpl->SetFooterVisibleState(true);
-                               pFormCore->SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
-                       }
-
-                       pFormCore->DeflateClientRectHeight(pXformer->TransformVertical(rect.height));
+                       pFormImpl->DeflateClientRectHeight(pXformer->TransformVertical(rect.height));
                }
 
                if (pImpl->GetWebKeypadEventListener())
@@ -1788,7 +1669,6 @@ OnWebKeypadStateChanged(void* pUserData, Evas_Object* pView, void* pEventInfo)
                                pImpl->GetWebKeypadEventListener()->OnWebKeypadWillOpen(*dynamic_cast< Web* >(&pImpl->GetPublic()));
                        }
                }
-               pImpl->SetKeypadVisibleState(true);
                pImpl->SetPreviousKeypadBounds(rect);
        }
        else
@@ -1805,6 +1685,23 @@ OnWebKeypadOpened(void* pUserData, Evas_Object* pView, void* pEventInfo)
        _WebImpl* pImpl = reinterpret_cast< _WebImpl* >(pUserData);
        SysAssertf(pImpl, "Failed to request");
 
+       pImpl->SetKeypadVisibleState(true);
+
+       _FormImpl* pFormImpl = pImpl->GetParentFormImpl(dynamic_cast< _ControlImpl* >(pImpl));
+       if (pFormImpl)
+       {
+               _ICoordinateSystemTransformer* pXformer = _CoordinateSystem::GetInstance()->GetInverseTransformer();
+               SysAssertf(pXformer, "Failed to get CoordinateTransformer");
+
+               pFormImpl->DeflateClientRectHeight(pXformer->TransformVertical(pImpl->GetPreviousKeypadBounds().height));
+
+               if (pFormImpl->HasFooter())
+               {
+                       pFormImpl->GetCore().SetKeypadShowState(true);
+                       pFormImpl->Draw();
+               }
+       }
+
        if (pImpl->GetWebKeypadEventListener())
        {
                pImpl->GetWebKeypadEventListener()->OnWebKeypadOpened(*static_cast< Web* >(&pImpl->GetPublic()));
@@ -1818,16 +1715,16 @@ OnWebKeypadClosed(void* pUserData, Evas_Object* pView, void* pEventInfo)
        _WebImpl* pImpl = reinterpret_cast< _WebImpl* >(pUserData);
        SysAssertf(pImpl, "Failed to request");
 
-       _Form* pFormCore = pImpl->GetParentFormCore(dynamic_cast< _Control* >(&pImpl->GetCore()));
-       if (pFormCore)
+       _FormImpl* pFormImpl = pImpl->GetParentFormImpl(dynamic_cast< _ControlImpl* >(pImpl));
+       if (pFormImpl)
        {
-               if (pFormCore->HasFooter() && pImpl->IsFooterVisible())
+               pFormImpl->DeflateClientRectHeight(0);
+
+               if (pFormImpl->HasFooter())
                {
-                       pImpl->SetFooterVisibleState(false);
-                       pFormCore->SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
+                       pFormImpl->GetCore().SetKeypadShowState(false);
+                       pFormImpl->Draw();
                }
-
-               pFormCore->DeflateClientRectHeight(0);
        }
 
        if (pImpl->GetWebKeypadEventListener())
@@ -1840,20 +1737,46 @@ OnWebKeypadClosed(void* pUserData, Evas_Object* pView, void* pEventInfo)
 
 
 void
+OnWindowObjectFocusLost(void* pUserData, Evas_Object* pWin, void* pEvent_info)
+{
+       _WebImpl* pImpl = reinterpret_cast< _WebImpl* >(pUserData);
+       SysAssertf(pImpl, "Failed to request");
+
+       pImpl->SetWinFocusLost(true);
+}
+
+
+void
 OnWindowObjectFocusGained(void* pUserData, Evas_Object* pWin, void* pEvent_info)
 {
        _WebImpl* pImpl = reinterpret_cast< _WebImpl* >(pUserData);
        SysAssertf(pImpl, "Failed to request");
 
-       if (pImpl->IsKeypadOpened() == true && pImpl->IsVisible() == true)
+       if (pImpl->IsVisible() == true && pImpl->IsFocused() == true)
        {
                _Web* pWebCore = dynamic_cast< _Web* >(&(pImpl->GetCore()));
                SysAssertf(pWebCore, "Failed to get Web core object");
 
-               evas_object_focus_set(pWebCore->GetWebNativeNode(), EINA_TRUE);
+               if (pImpl->IsWinFocusLost() == true)
+               {
+                       if (pImpl->IsKeypadOpened() == true)
+                       {
+                               evas_object_focus_set(pWebCore->GetWebNativeNode(), EINA_TRUE);
+                       }
+
+                       Ewk_Settings* pSettings = ewk_view_settings_get(pWebCore->GetWebNativeNode());
+                       SysAssertf(pSettings, "Failed to get settings instance.");
+
+                       if (ewk_settings_clear_text_selection_automatically_get(pSettings) == EINA_FALSE)
+                       {
+                               ewk_settings_clear_text_selection_automatically_set(pSettings, EINA_TRUE);
+
+                               evas_object_focus_set(pWebCore->GetWebNativeNode(), EINA_TRUE);
+                       }
+               }
        }
 
-       pImpl->SetKeypadOpened(false);
+       pImpl->SetWinFocusLost(false);
 }
 
 
@@ -1866,8 +1789,25 @@ OnWebNativeNodeFocusGained(void* pUserData, Evas* pCanvas, Evas_Object* pView, v
        if (pImpl->IsKeypadOpened() == true)
        {
                pImpl->SetKeypadOpened(false);
+       }
+}
+
+
+void
+OnWebNativeNodeFocusLost(void* pUserData, Evas* pCanvas, Evas_Object* pView, void* pEventInfo)
+{
+       _WebImpl* pImpl = reinterpret_cast< _WebImpl* >(pUserData);
+       SysAssertf(pImpl, "Failed to request");
+
+       if (pImpl->IsWinFocusLost() == true)
+       {
+               _Web* pWebCore = dynamic_cast< _Web* >(&(pImpl->GetCore()));
+               SysAssertf(pWebCore, "Failed to get Web core object");
 
-               pImpl->SetFocused();
+               Ewk_Settings* pSettings = ewk_view_settings_get(pWebCore->GetWebNativeNode());
+               SysAssertf(pSettings, "Failed to get settings instance.");
+
+               ewk_settings_clear_text_selection_automatically_set(pSettings, EINA_FALSE);
        }
 } 
 
@@ -2108,7 +2048,8 @@ OnScriptExecuted(Evas_Object* pView, const char* pResult, void* pUserData)
        SysLog(NID_WEB_CTRL, "result : %ls", result.GetPointer());
 
        _WebImpl* pImpl = reinterpret_cast< _WebImpl* >(evas_object_data_get(pView, WEB_CTRL));
-       if (pImpl && pImpl->IsPresenterAlived(pPresenter))
+       _WebManager* pWebManager = _WebManager::GetInstance();
+       if (pWebManager->IsValidCallback(reinterpret_cast< int >(pImpl), reinterpret_cast< int >(pPresenter)))
        {
                pPresenter->EndAsyncProcess(result);
        }
@@ -2217,11 +2158,11 @@ _WebImpl::_WebImpl(Web* pWeb, Tizen::Ui::_Control* pCore)
        , __isFooterVisible(false)
        , __isKeypadVisible(false)
        , __isKeypadOpened(false)
+       , __isWinFocusLost(false)
        , __isLoadingErrorOccurred(false)
        , __isRedirectRequested(false)
        , __isCertificateRequested(false)
        , __isCertificateConfirmed(false)
-       , __isOrientationChanged(false)
        , __isFormDataVisible(false)
        , __keypadBounds(0, 0, 0, 0)
        , __pWebCore(null)
@@ -2238,7 +2179,17 @@ _WebImpl::_WebImpl(Web* pWeb, Tizen::Ui::_Control* pCore)
        , __pWebEvent(null)
        , __pAuthChallenge(null)
        , __pAuthPopup(null)
-       , __pUserConfirmPopup(null)
+       , __pUserMediaConfirmPopup(null)
+       , __pContentHandlerConfirmPopup(null)
+       , __pProtocolHandlerConfirmPopup(null)
+       , __pGeolocationConfirmPopup(null)
+       , __pNotificationConfirmPopup(null)
+       , __pScriptAlertConfirmPopup(null)
+       , __pScriptConfirmPopup(null)
+       , __pAppCacheConfirmPopup(null)
+       , __pDbQuotaConfirmPopup(null)
+       , __pLocalFsQuotaConfirmPopup(null)
+       , __pIndexedDbQuotaConfirmPopup(null)
        , __pPromptPopup(null)
        , __pCertConfirmPopup(null)
        , __pSelectBox(null)
@@ -2249,6 +2200,7 @@ _WebImpl::_WebImpl(Web* pWeb, Tizen::Ui::_Control* pCore)
        , __policy(WEB_DECISION_CONTINUE)
        , __defaultUserAgent(L"")
        , __pFormDataList(null)
+       , __popupClosed(false)
 {
        __textSearch.__searchAll = false;
        __textSearch.__searchForward = true;
@@ -2262,7 +2214,15 @@ _WebImpl::_WebImpl(Web* pWeb, Tizen::Ui::_Control* pCore)
 
 _WebImpl::~_WebImpl()
 {
+       _WebManager* pWebManager = _WebManager::GetInstance();
+       SysTryCatch(NID_WEB_CTRL, pWebManager, , E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
+
+       pWebManager->RemoveWeb(reinterpret_cast< int >(this));
+       pWebManager->RemoveActiveWeb(this);
+
+CATCH:
        RemoveEventListenerCallback();
+
        ClearCertificateDb();
 }
 
@@ -2340,7 +2300,7 @@ _WebImpl::Construct(void)
        r = __textSearch.__searchQueue.Construct();
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       r = __callbackList.Construct();
+       r = __webNotificationList.Construct();
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        r = InitJsBridgeList();
@@ -2544,8 +2504,6 @@ _WebImpl::ShowSelectBoxPopup(bool isMultiSelect, const String& title, Eina_List*
 
        __pSelectBox = std::move(pSelectBox);
 
-       __pSelectBox->SetOwner(&GetPublic());
-
        return __pSelectBox->ShowPopup();
 }
 
@@ -2566,6 +2524,8 @@ _WebImpl::ClearSelectBoxPopup(void)
 
        __pSelectBox.reset();
 
+       Resume();
+
        return E_SUCCESS;
 }
 
@@ -2646,47 +2606,33 @@ _WebImpl::StopLoading(void) const
 void
 _WebImpl::Reload(void) const
 {
-       ewk_view_reload_bypass_cache(__pWebCore->GetWebNativeNode());
+       ewk_view_reload(__pWebCore->GetWebNativeNode());
 }
 
 
 String*
 _WebImpl::EvaluateJavascriptN(const String& scriptCode)
 {
-       if (scriptCode.GetLength() == 0)
+       Evas_Object* pView = __pWebCore->GetWebNativeNode();
+       if (!pView)
        {
                return null;
        }
        
-       result r = E_SUCCESS;
-
        std::unique_ptr<char[]> pScript(_StringConverter::CopyToCharArrayN(scriptCode));
        SysTryReturn(NID_WEB_CTRL, pScript.get(), null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
-       std::unique_ptr<_WebPresenter> pPresenter(new (std::nothrow) _WebPresenter());
+       std::unique_ptr<_WebPresenter> pPresenter(new (std::nothrow) _WebPresenter(this));
        SysTryReturn(NID_WEB_CTRL, pPresenter.get(), null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
-       r = __callbackList.Add(pPresenter.get());
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
+       ewk_view_script_execute(pView, pScript.get(), OnScriptExecuted, pPresenter.get());
 
-       ewk_view_script_execute(__pWebCore->GetWebNativeNode(), pScript.get(), OnScriptExecuted, pPresenter.get());
+       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));
 
-       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));
-       pPresenter->WaitAsyncProcess(*pResult.get());
-       
-       r = __callbackList.Remove(*pPresenter.get());
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
-       pPresenter.release();
-       
-       return pResult.release();
-}
+       pPresenter->WaitAsyncProcess(*pResult);
 
-
-bool
-_WebImpl::IsPresenterAlived(_WebPresenter* pPresenter) const
-{
-       return __callbackList.Contains(*pPresenter);
+       return pResult;
 }
 
 
@@ -2711,6 +2657,12 @@ _WebImpl::GetZoomLevel(void) const
 const PageNavigationList*
 _WebImpl::GetBackForwardListN(void) const
 {
+       Evas_Object* pView = __pWebCore->GetWebNativeNode();
+       if (!pView)
+       {
+               return null;
+       }
+
        result r = E_SUCCESS;
 
        _PageNavigationListImpl* pNavigationListImpl = null;
@@ -2725,7 +2677,7 @@ _WebImpl::GetBackForwardListN(void) const
        String url(L"");
        String title(L"");
 
-       Ewk_History* pEwkHistoryList = ewk_view_history_get(__pWebCore->GetWebNativeNode());
+       Ewk_History* pEwkHistoryList = ewk_view_history_get(pView);
        SysTryReturn(NID_WEB_CTRL, pEwkHistoryList, null, E_SYSTEM, "[%s] A system error has been occurred. Failed to get full history.", GetErrorMessage(E_SYSTEM));
 
        Ewk_History_Item* pEwkItem = ewk_history_nth_item_get(pEwkHistoryList, 0);
@@ -2785,6 +2737,12 @@ CATCH:
 bool
 _WebImpl::SearchText(const String& text, bool searchForward)
 {
+       Evas_Object* pView = __pWebCore->GetWebNativeNode();
+       if (!pView)
+       {
+               return false;
+       }
+
        result r = E_SUCCESS;
 
        Ewk_Find_Options condition = static_cast< Ewk_Find_Options >(EWK_FIND_OPTIONS_SHOW_HIGHLIGHT | EWK_FIND_OPTIONS_CASE_INSENSITIVE);
@@ -2794,14 +2752,14 @@ _WebImpl::SearchText(const String& text, bool searchForward)
            condition = static_cast < Ewk_Find_Options >(condition | EWK_FIND_OPTIONS_BACKWARDS);
        }
 
-       _WebPresenter presenter;
-       presenter.InitAsyncProcess();
+       std::unique_ptr<_WebPresenter> pPresenter(new (std::nothrow) _WebPresenter(this));
+       SysTryReturn(NID_WEB_CTRL, pPresenter.get(), false, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
-       r = SynchronizeSearch(SEARCH_SYNC, __pWebCore->GetWebNativeNode(), condition, text, searchForward, false, &presenter);
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       r = SynchronizeSearch(SEARCH_SYNC, pView, condition, text, searchForward, false, pPresenter.get());
+       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, false, r, "[%s] Propagating.", GetErrorMessage(r));
 
        int result = 0;
-       presenter.WaitAsyncProcess(result);
+       pPresenter->WaitAsyncProcess(result);
 
        return static_cast < bool >(result);
 }
@@ -2810,6 +2768,12 @@ _WebImpl::SearchText(const String& text, bool searchForward)
 result
 _WebImpl::SearchTextAllAsync(const Tizen::Base::String& text, bool caseSensitive)
 {
+       Evas_Object* pView = __pWebCore->GetWebNativeNode();
+       if (!pView)
+       {
+               return E_SUCCESS;
+       }
+
        result r = E_SUCCESS;
 
        Ewk_Find_Options condition = EWK_FIND_OPTIONS_SHOW_HIGHLIGHT;
@@ -2819,7 +2783,7 @@ _WebImpl::SearchTextAllAsync(const Tizen::Base::String& text, bool caseSensitive
            condition = static_cast <Ewk_Find_Options>(condition | EWK_FIND_OPTIONS_CASE_INSENSITIVE);
        }
 
-       r = SynchronizeSearch(SEARCH_ALL_ASYNC, __pWebCore->GetWebNativeNode(), condition, text, true, caseSensitive);
+       r = SynchronizeSearch(SEARCH_ALL_ASYNC, pView, condition, text, true, caseSensitive);
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        return E_SUCCESS;
@@ -2829,6 +2793,12 @@ _WebImpl::SearchTextAllAsync(const Tizen::Base::String& text, bool caseSensitive
 result
 _WebImpl::SearchNextAsync(bool searchForward)
 {
+       Evas_Object* pView = __pWebCore->GetWebNativeNode();
+       if (!pView)
+       {
+               return E_SUCCESS;
+       }
+
        SysTryReturnResult(NID_WEB_CTRL, __textSearch.__searchAll && __textSearch.__totalCount > -1, E_INVALID_OPERATION, "The SearchTextAllAsync() method is not called or completed.");
        SysTryReturnResult(NID_WEB_CTRL, (searchForward && __textSearch.__currentIndex < __textSearch.__totalCount) || (!searchForward && __textSearch.__currentIndex > 1)
                , E_OBJ_NOT_FOUND,  "The Next instance is not available.");
@@ -2847,7 +2817,7 @@ _WebImpl::SearchNextAsync(bool searchForward)
                condition = static_cast <Ewk_Find_Options>(condition | EWK_FIND_OPTIONS_BACKWARDS);
        }
 
-       r = SynchronizeSearch(SEARCH_NEXT_ASYNC, __pWebCore->GetWebNativeNode(), condition, __textSearch.__text, searchForward);
+       r = SynchronizeSearch(SEARCH_NEXT_ASYNC, pView, condition, __textSearch.__text, searchForward);
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        return E_SUCCESS;
@@ -3064,6 +3034,12 @@ _WebImpl::GetElementByPointN(const Point& point) const
 const HitElementResult*
 _WebImpl::GetElementByPointN(const FloatPoint& point) const
 {
+       Evas_Object* pView = __pWebCore->GetWebNativeNode();
+       if (!pView)
+       {
+               return null;
+       }
+
        SysTryReturn(NID_WEB_CTRL, Contains(point), null, E_INVALID_ARG, "[%s] The point must be contained in the bounds of a web control.", GetErrorMessage(E_INVALID_ARG));
 
        result r = E_SUCCESS;
@@ -3076,7 +3052,7 @@ _WebImpl::GetElementByPointN(const FloatPoint& point) const
 
        Point absPoint(_CoordinateSystemUtils::ConvertToInteger(__pWebCore->GetAbsoluteCoordinate(point)));
 
-       Ewk_Hit_Test* pEwkHitTest = ewk_view_hit_test_new(__pWebCore->GetWebNativeNode(), absPoint.x, absPoint.y, EWK_HIT_TEST_MODE_ALL);
+       Ewk_Hit_Test* pEwkHitTest = ewk_view_hit_test_new(pView, absPoint.x, absPoint.y, EWK_HIT_TEST_MODE_ALL);
        SysTryReturn(NID_WEB_CTRL, pEwkHitTest, null, E_SYSTEM, "[%s] Failed to get hit test.", GetErrorMessage(E_SYSTEM));
 
        Eina_Hash* pAttrHash = ewk_hit_test_attribute_hash_get(pEwkHitTest);
@@ -3233,7 +3209,6 @@ void
 _WebImpl::ClearCache(void)
 {
        Ewk_Context* pContext = ewk_view_context_get(__pWebCore->GetWebNativeNode());
-       SysAssertf(pContext, "Failed to get webkit instance.");
 
        ewk_context_cache_clear(pContext);
 }
@@ -3244,7 +3219,6 @@ _WebImpl::ClearCookie(void)
 {
        Ewk_Context* pContext = ewk_view_context_get(__pWebCore->GetWebNativeNode());
        Ewk_Cookie_Manager* pCookieManager =  ewk_context_cookie_manager_get(pContext);
-       SysAssertf(pCookieManager, "Failed to get webkit instance.");
 
        ewk_cookie_manager_cookies_clear(pCookieManager);
 }
@@ -3254,7 +3228,6 @@ void
 _WebImpl::ClearFormData(void)
 {
        Ewk_Context* pContext = ewk_view_context_get(__pWebCore->GetWebNativeNode());
-       SysAssertf(pContext, "Failed to get webkit instance.");
 
        ewk_context_form_candidate_data_clear(pContext);
 }
@@ -3264,7 +3237,6 @@ void
 _WebImpl::ClearLoginFormData(void)
 {
        Ewk_Context* pContext = ewk_view_context_get(__pWebCore->GetWebNativeNode());
-       SysAssertf(pContext, "Failed to get webkit instance.");
 
        ewk_context_form_password_data_clear(pContext);
 }
@@ -3282,13 +3254,13 @@ _WebImpl::IsCookieEnabled(void) const
        Ewk_Cookie_Manager* pCookieManager =  ewk_context_cookie_manager_get(pContext);
        SysAssertf(pCookieManager, "Failed to get webkit instance.");
 
-       _WebPresenter presenter;
-       presenter.InitAsyncProcess();
+       std::unique_ptr<_WebPresenter> pPresenter(new (std::nothrow) _WebPresenter(this));
+       SysTryReturn(NID_WEB_CTRL, pPresenter.get(), false, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
-       ewk_cookie_manager_async_accept_policy_get(pCookieManager, OnCookiesPolicyGot, &presenter);
+       ewk_cookie_manager_async_accept_policy_get(pCookieManager, OnCookiesPolicyGot, pPresenter.get());
 
        bool result = false;
-       presenter.WaitAsyncProcess(result);
+       pPresenter->WaitAsyncProcess(result);
 
        return result;
 }
@@ -3600,6 +3572,7 @@ _WebImpl::SetEventListenerCallback(void) const
                evas_object_smart_callback_add(pWebNativeNode, "requestToNative,json", OnHandleJavaScriptRequest, this);
 
                evas_object_smart_callback_add(pWinObject, "focus,in", OnWindowObjectFocusGained, this);
+               evas_object_smart_callback_add(pWinObject, "focus,out", OnWindowObjectFocusLost, this);
 
                evas_object_smart_callback_add(pWebNativeNode, "inputmethod,changed", OnWebKeypadStateChanged, this);
                evas_object_smart_callback_add(pWebNativeNode, "editorclient,ime,opened", OnWebKeypadOpened, this);
@@ -3636,10 +3609,14 @@ _WebImpl::SetEventListenerCallback(void) const
                evas_object_smart_callback_add(pWebNativeNode, "touchmove,handled", OnWebPreventDefaultTriggered, this);
                evas_object_smart_callback_add(pWebNativeNode, "icon,received", OnFaviconReceived, this);
 
-               evas_object_smart_callback_add(pWebNativeNode, "text,style,state", OnWebPageBlockSelected, this);
-               evas_object_smart_callback_add(pWebNativeNode, "frame,rendered", OnWebPageBlockSelectedByOrientation, this);
+               evas_object_smart_callback_add(pWebNativeNode, "magnifier,hide", OnWebPageBlockSelected, this);
+
+               evas_object_smart_callback_add(pWebNativeNode, "fullscreen,enterfullscreen", OnFullScreenEntered, this);
+               evas_object_smart_callback_add(pWebNativeNode, "fullscreen,exitfullscreen", OnFullScreenExited, this);
+
+               evas_object_smart_callback_add(pWebNativeNode, "keyevent,down,not,handled", OnFocusDownRequested, this);
+               evas_object_smart_callback_add(pWebNativeNode, "keyevent,up,not,handled", OnFocusUpRequested, this);
 
-               ewk_view_open_panel_callback_set(pWebNativeNode, OnSelectUploadFile, const_cast< _WebImpl* >(this));
                Ewk_Context* pContext = ewk_view_context_get(pWebNativeNode);
                SysAssertf(pContext, "Failed to get webkit instance.");
                ewk_context_did_start_download_callback_set(pContext, OnDidStartDownloadCallback, const_cast< _WebImpl* >(this));
@@ -3651,6 +3628,7 @@ _WebImpl::SetEventListenerCallback(void) const
                ewk_view_exceeded_local_file_system_quota_callback_set(pWebNativeNode, OnLocalFileSystemQuotaExceeded, 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);
        }
 }
 
@@ -3678,10 +3656,12 @@ _WebImpl::RemoveEventListenerCallback(void) const
                evas_object_smart_callback_del(pWebNativeNode, "load,stop", OnLoadingCanceled);
                evas_object_smart_callback_del(pWebNativeNode, "load,error", OnLoadingErrorOccurred);
                evas_object_smart_callback_del(pWebNativeNode, "title,changed", OnPageTitleReceived);
+               evas_object_smart_callback_del(pWebNativeNode, "load,committed", OnLoadingCommitted);
 
                evas_object_smart_callback_del(pWebNativeNode, "requestToNative,json", OnHandleJavaScriptRequest);
 
                evas_object_smart_callback_del_full(pWinObject, "focus,in", OnWindowObjectFocusGained, this);
+               evas_object_smart_callback_del_full(pWinObject, "focus,out", OnWindowObjectFocusLost, this);
 
                evas_object_smart_callback_del(pWebNativeNode, "inputmethod,changed", OnWebKeypadStateChanged);
                evas_object_smart_callback_del(pWebNativeNode, "editorclient,ime,opened", OnWebKeypadOpened);
@@ -3692,9 +3672,9 @@ _WebImpl::RemoveEventListenerCallback(void) const
 
                evas_object_smart_callback_del(pWebNativeNode, "geolocation,permission,request", OnGeolocationPermissionRequested);
 
-               ewk_view_javascript_alert_callback_set(null, null, null);
-               ewk_view_javascript_prompt_callback_set(null, null, null);
-               ewk_view_javascript_confirm_callback_set(null, null, null);
+               ewk_view_javascript_alert_callback_set(pWebNativeNode, null, null);
+               ewk_view_javascript_prompt_callback_set(pWebNativeNode, null, null);
+               ewk_view_javascript_confirm_callback_set(pWebNativeNode, null, null);
 
                evas_object_smart_callback_del(pWebNativeNode, "policy,response,decide", OnWebDataReceived);
 
@@ -3718,10 +3698,14 @@ _WebImpl::RemoveEventListenerCallback(void) const
                evas_object_smart_callback_del(pWebNativeNode, "touchmove,handled", OnWebPreventDefaultTriggered);
                evas_object_smart_callback_del(pWebNativeNode, "icon,received", OnFaviconReceived);
 
-               evas_object_smart_callback_del(pWebNativeNode, "text,style,state", OnWebPageBlockSelected);
-               evas_object_smart_callback_del(pWebNativeNode, "frame,rendered", OnWebPageBlockSelectedByOrientation);
+               evas_object_smart_callback_del(pWebNativeNode, "magnifier,hide", OnWebPageBlockSelected);
+
+               evas_object_smart_callback_del(pWebNativeNode, "fullscreen,enterfullscreen", OnFullScreenEntered);
+               evas_object_smart_callback_del(pWebNativeNode, "fullscreen,exitfullscreen", OnFullScreenExited);
+
+               evas_object_smart_callback_del(pWebNativeNode, "keyevent,down,not,handled", OnFocusDownRequested);
+               evas_object_smart_callback_del(pWebNativeNode, "keyevent,up,not,handled", OnFocusUpRequested);
 
-               ewk_view_open_panel_callback_set(null, null, null);
                Ewk_Context* pContext = ewk_view_context_get(pWebNativeNode);
                SysAssertf(pContext, "Failed to get webkit instance.");
                ewk_context_vibration_client_callbacks_set(pContext, null, null, null);
@@ -3732,6 +3716,7 @@ _WebImpl::RemoveEventListenerCallback(void) const
                ewk_view_exceeded_local_file_system_quota_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);
        }
 }
 
@@ -3746,7 +3731,7 @@ _WebImpl::ClearCertificateDb(void)
        _DatabaseImpl db;
 
        r = db.Construct(certificatePath, "r+", null);
-       SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
        db.BeginTransaction();
 
@@ -3772,35 +3757,32 @@ _WebImpl::SetBlockSelectionPosition(const Point& startPoint)
 result
 _WebImpl::SetBlockSelectionPosition(const FloatPoint& startPoint)
 {
-       Evas_Object* pWebNativeNode = __pWebCore->GetWebNativeNode();
-
-       Ewk_View_Smart_Data* pSmartData = (Ewk_View_Smart_Data*) evas_object_smart_data_get(pWebNativeNode);
-       SysAssertf(pSmartData, "Failed to request");
+       Evas_Object* pWebview = __pWebCore->GetWebNativeNode();
+       if (!pWebview)
+       {
+               return E_SUCCESS;
+       }
 
-       Point absPoint( _CoordinateSystemUtils::ConvertToInteger(__pWebCore->GetAbsoluteCoordinate(startPoint)));
+       Ewk_View_Smart_Data* pSmartData = reinterpret_cast< Ewk_View_Smart_Data* >(evas_object_smart_data_get(pWebview));
+       SysAssertf(pSmartData && pSmartData->api, "Failed to get webkit instance.");
+       Point absPoint(_CoordinateSystemUtils::ConvertToInteger(__pWebCore->GetAbsoluteCoordinate(startPoint)));
 
        Eina_Bool ret = pSmartData->api->text_selection_down(pSmartData, absPoint.x, absPoint.y);
        if (ret)
        {
                pSmartData->api->text_selection_up(pSmartData, absPoint.x, absPoint.y);
 
-               Ewk_Hit_Test* pEwkHitTest = ewk_view_hit_test_new(__pWebCore->GetWebNativeNode(), absPoint.x, absPoint.y, EWK_HIT_TEST_MODE_ALL);
+               Ewk_Hit_Test* pEwkHitTest = ewk_view_hit_test_new(pWebview, absPoint.x, absPoint.y, EWK_HIT_TEST_MODE_ALL);
                SysTryReturnResult(NID_WEB_CTRL, pEwkHitTest, E_SYSTEM, "Failed to get hit test.");
 
                String tagName(ewk_hit_test_tag_name_get(pEwkHitTest));
 
-               if (tagName.Equals(L"INPUT", false) || tagName.Equals(L"TEXTAREA", false))
-               {
-                       ewk_view_command_execute(pWebNativeNode, "SelectWord", 0);
-               }
-               else
+               Eina_Hash* pAttrHash = ewk_hit_test_attribute_hash_get(pEwkHitTest);
+               char* pValue = reinterpret_cast< char* >(eina_hash_find(pAttrHash, "contenteditable"));
+               if (tagName.Equals(L"INPUT", false) || tagName.Equals(L"TEXTAREA", false) || pValue)
                {
-                       Eina_Hash* pAttrHash = ewk_hit_test_attribute_hash_get(pEwkHitTest);
-                       char* pValue = reinterpret_cast< char* >(eina_hash_find(pAttrHash, "contenteditable"));
-                       if(pValue)
-                       {
-                               ewk_view_command_execute(pWebNativeNode, "SelectWord", 0);
-                       }
+                       ewk_view_command_execute(pWebview, "SelectWord", 0);
+                       evas_object_smart_callback_call(pWebview, "magnifier,hide", NULL);
                }
        }
 
@@ -3836,6 +3818,9 @@ _WebImpl::GetBlockRange(FloatPoint& startPoint, FloatPoint& endPoint) const
        Eina_Rectangle leftHandle;
        Eina_Rectangle rightHandle;
 
+       EINA_RECTANGLE_SET(&leftHandle, 0, 0, 0, 0);
+       EINA_RECTANGLE_SET(&rightHandle, 0, 0, 0, 0);
+
        ewk_view_text_selection_range_get(__pWebCore->GetWebNativeNode(), &leftHandle, &rightHandle);
 
        startPoint.x = _CoordinateSystemUtils::ConvertToFloat(leftHandle.x);
@@ -3857,18 +3842,9 @@ _WebImpl::GetFaviconN(void) const
        result r = E_SUCCESS;
 
        Evas_Object* pView = __pWebCore->GetWebNativeNode();
-
-       Evas* pEvas = evas_object_evas_get(pView);
        Ewk_Context* pContext = ewk_view_context_get(pView);
-       SysAssertf(pEvas && pContext, "Failed to request");
-
        const char* pUrl = ewk_view_url_get(pView);
-
-       Tizen::Graphics::BufferInfo bufferInfo;
-       Tizen::Base::ByteBuffer byteBuffer;
-
-       std::unique_ptr<Bitmap> pBitmapImage(new (std::nothrow) Bitmap());
-       SysTryReturn(NID_WEB_CTRL, pBitmapImage.get(), null, E_OUT_OF_MEMORY, "[%s] Memory Allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
+       Evas* pEvas = evas_object_evas_get(pView);
 
        Evas_Object* pFavicon = ewk_context_icon_database_icon_object_add(pContext, pUrl, pEvas);
        if (!pFavicon)
@@ -3876,18 +3852,24 @@ _WebImpl::GetFaviconN(void) const
                return null;
        }
 
+       Tizen::Graphics::BufferInfo bufferInfo;
+
        r = _Utility::GetPixelBufferFromEvasObject(pFavicon,  bufferInfo);
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
 
        const Dimension dimension(bufferInfo.width, bufferInfo.height);
-
+       Tizen::Base::ByteBuffer byteBuffer;
+       
        r = byteBuffer.Construct((byte*)bufferInfo.pPixels, 0, dimension.height * dimension.width * 32, dimension.height * dimension.width * 32 );
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       r = pBitmapImage->Construct(byteBuffer, dimension, BITMAP_PIXEL_FORMAT_ARGB8888);
+       std::unique_ptr<Bitmap> pImage(new (std::nothrow) Bitmap());
+       SysTryReturn(NID_WEB_CTRL, pImage.get(), null, E_OUT_OF_MEMORY, "[%s] Memory Allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
+
+       r = pImage->Construct(byteBuffer, dimension, BITMAP_PIXEL_FORMAT_ARGB8888);
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       return pBitmapImage.release();
+       return pImage.release();
 
 }
 
@@ -3931,6 +3913,36 @@ _WebImpl::GetPageSize(void) const
 }
 
 
+result
+_WebImpl::AddHttpHeaderField(const String& name, const String& value)
+{
+       SysTryReturnResult(NID_WEB_CTRL, name.GetLength() > 0, E_INVALID_ARG, "Invalid argument(s) is used. name key is missing.");
+
+       std::unique_ptr<char[]> pName(_StringConverter::CopyToCharArrayN(name));
+       SysTryReturn(NID_WEB_CTRL, pName.get(), GetLastResult(), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
+
+       std::unique_ptr<char[]> pValue(_StringConverter::CopyToCharArrayN(value));
+
+       ewk_view_custom_header_add(__pWebCore->GetWebNativeNode(), pName.get(), pValue.get());
+
+       return E_SUCCESS;
+}
+
+
+result
+_WebImpl::RemoveHttpHeaderField(const String& name)
+{
+       SysTryReturnResult(NID_WEB_CTRL, name.GetLength() > 0, E_INVALID_ARG, "Invalid argument(s) is used. name key is missing.");
+
+       std::unique_ptr<char[]> pName(_StringConverter::CopyToCharArrayN(name));
+       SysTryReturn(NID_WEB_CTRL, pName.get(), GetLastResult(), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
+
+       ewk_view_custom_header_remove(__pWebCore->GetWebNativeNode(), pName.get());
+
+       return E_SUCCESS;
+}
+
+
 void
 _WebImpl::SetLoadingErrorOccurred(bool arg)
 {
@@ -4001,89 +4013,6 @@ _WebImpl::IsCertificateConfirmed(void) const
 }
 
 
-void
-_WebImpl::SetOrientationChanged(bool arg)
-{
-       __isOrientationChanged = arg;
-}
-
-
-bool
-_WebImpl::IsOrientationChanged(void) const
-{
-       return __isOrientationChanged;
-}
-
-
-result
-_WebImpl::LaunchAppControl(const IEventArg& arg)
-{
-       result r = E_SUCCESS;
-
-       IEventArg* pArg = const_cast< IEventArg* >(&arg);
-       _WebEventArg* pWebEventArg = dynamic_cast< _WebEventArg* >(pArg);
-       SysTryReturnResult(NID_WEB_CTRL, pWebEventArg, E_INVALID_ARG, "Type casting failed. argument must be IEventArg type.");
-
-       String operationId(L"");
-       String uriPattern(pWebEventArg->GetEventMessage());
-       SysLog(NID_WEB_CTRL, "The current value of web event type is %d", pWebEventArg->GetEventType());
-
-       switch (pWebEventArg->GetEventType())
-       {
-       case WEB_EVENT_REQUEST_RTSP:
-       {
-               String ext;
-               String mimeType;
-               int uriLength = uriPattern.GetLength();
-               int index;
-
-               operationId = L"http://tizen.org/appcontrol/operation/view";
-
-               r = uriPattern.LastIndexOf(L".", uriLength - 1, index);
-               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-               r = uriPattern.SubString(index + 1, ext);
-               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-               r = _AppControlManager::GetMimeFromExt(ext, mimeType);
-               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-               r = _AppControlImpl::FindAndStart(operationId, &uriPattern, &mimeType, null, null, null);
-               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-               return r;
-       }
-       case WEB_EVENT_REQUEST_TEL:
-       {
-               operationId = L"http://tizen.org/appcontrol/operation/dial";
-               break;
-       }
-       case WEB_EVENT_REQUEST_EMAIL:
-       //fall through
-       case WEB_EVENT_REQUEST_SMS:
-       //fall through
-       case WEB_EVENT_REQUEST_MMS:
-       {
-               operationId = L"http://tizen.org/appcontrol/operation/compose";
-               break;
-       }
-       case WEB_EVENT_REQUEST_UNKNOWN:
-       {
-               operationId = L"http://tizen.org/appcontrol/operation/view";
-               break;
-       }
-       default:
-               SysAssert(false);
-               break;
-       }
-
-       r = _AppControlImpl::FindAndStart(operationId, &uriPattern, null, null, null, null);
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       return r;
-}
-
-
 result
 _WebImpl::SetFullScreenKeypad(void)
 {
@@ -4162,6 +4091,20 @@ _WebImpl::SetKeypadOpened(bool isKeypadOpened)
 }
 
 
+bool
+_WebImpl::IsWinFocusLost(void) const
+{
+       return __isWinFocusLost;
+}
+
+
+void
+_WebImpl::SetWinFocusLost(bool isWinFocusLost)
+{
+       __isWinFocusLost = isWinFocusLost;
+}
+
+
 Rectangle
 _WebImpl::GetPreviousKeypadBounds(void) const
 {
@@ -4601,13 +4544,14 @@ _WebImpl::ShowAuthenticationPopup(const String& host, const String& realm, Authe
 
        int modalResult = 0;
 
-       __pAuthPopup->SetOwner(&GetPublic());
-       
        r = __pAuthPopup->ShowAndWait(modalResult);
        SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
 CATCH:
-       __pAuthPopup.reset();
+       if (__pAuthPopup)
+       {
+               __pAuthPopup.reset();
+       }
 
        return r;
 }
@@ -4628,18 +4572,19 @@ _WebImpl::ShowCertificateConfirmPopup(_CertificatePopupMode userConfirmMode, Ewk
 
        int modalResult = 0;
 
-       __pCertConfirmPopup->SetOwner(&GetPublic());
-       
        r = __pCertConfirmPopup->ShowAndWait(modalResult);
        SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       if (userConfirmMode == CERTIFICATE_POPUP_MODE_USER_CONFIRM)
+       if (__pCertConfirmPopup.get() && userConfirmMode == CERTIFICATE_POPUP_MODE_USER_CONFIRM)
        {
                __isCertificateConfirmed = __pCertConfirmPopup->GetConfirmResult();
        }
 
 CATCH:
-       __pCertConfirmPopup.reset();
+       if (__pCertConfirmPopup.get())
+       {
+               __pCertConfirmPopup.reset();
+       }
 
        return r;
 }
@@ -4653,13 +4598,11 @@ _WebImpl::ShowPromptPopup(String msg, String defVal)
        std::unique_ptr< _PromptPopup > pPromptPopup(new (std::nothrow) _PromptPopup());
        SysTryReturnResult(NID_WEB_CTRL, pPromptPopup.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
 
-       r = pPromptPopup->Construct(msg, defVal, __pWebCore->GetWebNativeNode());
+       r = pPromptPopup->Construct(msg, defVal, __pWebCore->GetWebNativeNode(), this);
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        __pPromptPopup = std::move(pPromptPopup);
 
-       __pPromptPopup->SetOwner(&GetPublic());
-
        r = __pPromptPopup->ShowPopup();
        SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -4681,22 +4624,96 @@ _WebImpl::ShowUserConfirmPopup(_UserConfirmMode userConfirmMode, void* pPolicy,
        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, msg);
+       r = pUserConfirmPopup->Construct(userConfirmMode, pPolicy, this, true, msg);
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       __pUserConfirmPopup = std::move(pUserConfirmPopup);
-
        int modalResult = 0;
 
-       __pUserConfirmPopup->SetOwner(&GetPublic());
-       
-       r = __pUserConfirmPopup->ShowAndWait(modalResult);
-       SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
-       
-CATCH:
-       __pUserConfirmPopup.reset();
+       switch(userConfirmMode)
+       {
+       case USER_CONTENT_HANDLER:
+       {
+               __pContentHandlerConfirmPopup = std::move(pUserConfirmPopup);
 
-       return r;
+               r = __pContentHandlerConfirmPopup->ShowAndWait(modalResult);
+               SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, __pContentHandlerConfirmPopup.reset(), r, "[%s] Propagating.", GetErrorMessage(r));
+
+               __pContentHandlerConfirmPopup.reset();
+
+               ewk_view_resume(__pWebCore->GetWebNativeNode());
+
+               break;
+       }
+       case USER_PROTOCOL_HANDLER:
+       {
+               __pProtocolHandlerConfirmPopup = std::move(pUserConfirmPopup);
+
+               r = __pProtocolHandlerConfirmPopup->ShowAndWait(modalResult);
+               SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, __pProtocolHandlerConfirmPopup.reset(), r, "[%s] Propagating.", GetErrorMessage(r));
+
+               __pProtocolHandlerConfirmPopup.reset();
+
+               ewk_view_resume(__pWebCore->GetWebNativeNode());
+
+               break;
+       }
+       case USER_CONFIRM_APP_CACHE:
+       {
+               __pAppCacheConfirmPopup = std::move(pUserConfirmPopup);
+
+               r = __pAppCacheConfirmPopup->ShowAndWait(modalResult);
+               SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, __pAppCacheConfirmPopup.reset(), r, "[%s] Propagating.", GetErrorMessage(r));
+
+               __pAppCacheConfirmPopup.reset();
+
+               ewk_view_resume(__pWebCore->GetWebNativeNode());
+
+               break;
+       }
+       case USER_CONFIRM_DB_QUOTA_EXCEDED:
+       {
+               __pDbQuotaConfirmPopup = std::move(pUserConfirmPopup);
+
+               r = __pDbQuotaConfirmPopup->ShowAndWait(modalResult);
+               SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, __pDbQuotaConfirmPopup.reset(), r, "[%s] Propagating.", GetErrorMessage(r));
+
+               __pDbQuotaConfirmPopup.reset();
+
+               ewk_view_resume(__pWebCore->GetWebNativeNode());
+
+               break;
+       }
+       case USER_CONFIRM_LOCAL_FS_QUOTA_EXCEDED:
+       {
+               __pLocalFsQuotaConfirmPopup = std::move(pUserConfirmPopup);
+
+               r = __pLocalFsQuotaConfirmPopup->ShowAndWait(modalResult);
+               SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, __pLocalFsQuotaConfirmPopup.reset(), r, "[%s] Propagating.", GetErrorMessage(r));
+
+               __pLocalFsQuotaConfirmPopup.reset();
+
+               ewk_view_resume(__pWebCore->GetWebNativeNode());
+
+               break;
+       }
+       case USER_CONFIRM_INDEXED_DB_QUOTA_EXCEDED:
+       {
+               __pIndexedDbQuotaConfirmPopup = std::move(pUserConfirmPopup);
+
+               r = __pIndexedDbQuotaConfirmPopup->ShowAndWait(modalResult);
+               SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, __pIndexedDbQuotaConfirmPopup.reset(), r, "[%s] Propagating.", GetErrorMessage(r));
+
+               __pIndexedDbQuotaConfirmPopup.reset();
+
+               ewk_view_resume(__pWebCore->GetWebNativeNode());
+
+               break;
+       }
+       default:
+               break;
+       }
+CATCH:
+               return r;
 }
 
 
@@ -4708,46 +4725,96 @@ _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, msg);
+       r = pUserConfirmPopup->Construct(userConfirmMode, pPolicy, this, false, msg);
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       __pUserConfirmPopup = std::move(pUserConfirmPopup);
+       switch(userConfirmMode)
+       {
+       case USER_CONFIRM_USERMEDIA:
+       {
+               __pUserMediaConfirmPopup.reset();
+
+               __pUserMediaConfirmPopup = std::move(pUserConfirmPopup);
 
-       __pUserConfirmPopup->SetOwner(&GetPublic());
+               r = __pUserMediaConfirmPopup->ShowPopup();
+               SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, __pUserMediaConfirmPopup.reset(), r, "[%s] Propagating.", GetErrorMessage(r));
 
-       r = __pUserConfirmPopup->ShowPopup();
-       SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+               break;
+       }
+       case USER_CONFIRM_GEOLOCATION:
+       {
+               __pGeolocationConfirmPopup.reset();
+
+               __pGeolocationConfirmPopup = std::move(pUserConfirmPopup);
+
+               r = __pGeolocationConfirmPopup->ShowPopup();
+               SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, __pGeolocationConfirmPopup.reset(), r, "[%s] Propagating.", GetErrorMessage(r));
+
+               break;
+       }
+       case USER_CONFIRM_NOTIFICATION:
+       {
+               __pNotificationConfirmPopup.reset();
+
+               __pNotificationConfirmPopup = std::move(pUserConfirmPopup);
+
+               r = __pNotificationConfirmPopup->ShowPopup();
+               SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, __pNotificationConfirmPopup.reset(), r, "[%s] Propagating.", GetErrorMessage(r));
+
+               break;
+       }
+       case USER_SCRIPT_ALERT:
+       {
+               __pScriptAlertConfirmPopup.reset();
+
+               __pScriptAlertConfirmPopup = std::move(pUserConfirmPopup);
+
+               r = __pScriptAlertConfirmPopup->ShowPopup();
+               SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, __pScriptAlertConfirmPopup.reset(), r, "[%s] Propagating.", GetErrorMessage(r));
+
+               break;
+       }
+       case USER_SCRIPT_CONFIRM:
+       {
+               __pScriptConfirmPopup.reset();
 
-       __pUserConfirmPopup.release();
+               __pScriptConfirmPopup = std::move(pUserConfirmPopup);
+
+               r = __pScriptConfirmPopup->ShowPopup();
+               SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, __pScriptConfirmPopup.reset(), r, "[%s] Propagating.", GetErrorMessage(r));
+
+               break;
+       }
+       default:
+               break;
+       }
 
        return E_SUCCESS;
 
 CATCH:
-       __pUserConfirmPopup.reset();
-
        return r;
 }
 
 
-_Form*
-_WebImpl::GetParentFormCore(_Control* pControlCore)
+_FormImpl*
+_WebImpl::GetParentFormImpl(_ControlImpl* pControlImpl)
 {
        String parentName;
-       _Form* pFormCore = null;
+       _FormImpl* pFormImpl = null;
 
-       _Control* pParentControlCore = dynamic_cast< _Control* >(pControlCore->GetParent());
-       if (!pParentControlCore)
+       _ControlImpl* pParentControlImpl = dynamic_cast< _ControlImpl* >(pControlImpl->GetParent());
+       if (!pParentControlImpl)
        {
                return null;
        }
 
-       pFormCore = dynamic_cast< _Form* >(pParentControlCore);
-       if (pFormCore)
+       pFormImpl = dynamic_cast< _FormImpl* >(pParentControlImpl);
+       if (pFormImpl)
        {
-               return pFormCore;
+               return pFormImpl;
        }
 
-       return GetParentFormCore(pParentControlCore);
+       return GetParentFormImpl(pParentControlImpl);
 }
 
 
@@ -4761,15 +4828,17 @@ _WebImpl::OnFocusGained(const _ControlImpl& source)
 bool 
 _WebImpl::OnFocusLost(const _ControlImpl& source)
 {
+       Evas_Object* pWebview = __pWebCore->GetWebNativeNode();
+       if (!pWebview)
+       {
+               return false;
+       }
+
        if(IsKeypadVisible() == true)
        {
                SetKeypadOpened(true);
-
-               SetKeypadVisibleState(false);
        }
 
-       evas_object_focus_set(__pWebCore->GetWebNativeNode(), EINA_FALSE);
-
        return false;
 }
 
@@ -4791,13 +4860,44 @@ _WebImpl::OnPreAttachedToMainTree(void)
 {
        result r = E_SUCCESS;
 
-       r = __pWebCore->InitializeWebNativeNode();
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       if (IsVisible() == true)
+       {
+               _WebManager* pWebManager = _WebManager::GetInstance();
+               pWebManager->SetActiveWeb(this);
+       }
 
-       r = InitializeSetting();
+       r = _ContainerImpl::OnPreAttachedToMainTree();
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       r = _ContainerImpl::OnPreAttachedToMainTree();
+       if (!HasValidNativeNode())
+       {
+               r = __pWebCore->InitializeWebNativeNode();
+               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
+               _ControlManager* pControlManager = _ControlManager::GetInstance();
+               SysTryReturnResult(NID_WEB_CTRL, pControlManager, E_SYSTEM, "Failed to get the ControlManager instance.");
+               OnChangeLayout(pControlManager->GetScreenRotation());
+
+               r = InitializeSetting();
+               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
+               _WebManager* pWebManager = _WebManager::GetInstance();
+               pWebManager->AddWeb(reinterpret_cast< int >(this));
+       }
+
+       return E_SUCCESS;
+}
+
+
+result
+_WebImpl::OnDetachingFromMainTree(void)
+{
+       result r = E_SUCCESS;
+
+       _WebManager* pWebManager = _WebManager::GetInstance();
+       pWebManager->RemoveActiveWeb(this);
+
+       r = _ContainerImpl::OnDetachingFromMainTree();
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        return E_SUCCESS;
@@ -4805,6 +4905,32 @@ _WebImpl::OnPreAttachedToMainTree(void)
 
 
 void
+_WebImpl::OnChangeLayout(_ControlRotation rotation)
+{
+       int degree = 0;
+
+       switch (rotation)
+       {
+               case _CONTROL_ROTATION_0:
+                       degree =  0;
+                       break;
+               case _CONTROL_ROTATION_90:
+                       degree =  90;
+                       break;
+               case _CONTROL_ROTATION_180:
+                       degree =  180;
+                       break;
+               case _CONTROL_ROTATION_270:
+                       degree =  -90;
+                       break;
+               default:
+                       SysAssert(false);
+       }
+       ewk_view_orientation_send(__pWebCore->GetWebNativeNode(), degree);
+}
+
+
+void
 _WebImpl::OnChangeLayout(_ControlOrientation orientation)
 {
        _ContainerImpl::OnChangeLayout(orientation);
@@ -4816,19 +4942,29 @@ _WebImpl::OnChangeLayout(_ControlOrientation orientation)
 
        HideFormDataWindow();
 
-       __isOrientationChanged = true;
+       std::unique_ptr< IEnumerator > pEnum(__webNotificationList.GetEnumeratorN());
+       _WebNotification* pWebNotification = null;
+
+       while (pEnum->MoveNext() == E_SUCCESS)
+       {
+               pWebNotification = static_cast< _WebNotification* >(pEnum->GetCurrent());
+               pWebNotification->OnChangeLayout();
+       }
 }
 
 
 void
 _WebImpl::OnAncestorVisibleStateChanged(const _Control& control)
 {
+       _WebManager* pWebManager = _WebManager::GetInstance();
        if (IsVisible() == true)
        {
+               pWebManager->SetActiveWeb(this);
                ewk_view_page_visibility_state_set(__pWebCore->GetWebNativeNode(), EWK_PAGE_VISIBILITY_STATE_VISIBLE, false);
        }
        else
        {
+               pWebManager->RemoveActiveWeb(this);
                ewk_view_page_visibility_state_set(__pWebCore->GetWebNativeNode(), EWK_PAGE_VISIBILITY_STATE_HIDDEN, false);
        }
 }
@@ -4837,6 +4973,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:
@@ -4845,12 +4983,26 @@ _WebImpl::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::ILi
        case ID_PROMPT_POPUP_CLOSE:
                __pPromptPopup.reset();
                break;
-       case ID_USER_CONFIRM_POPUP_CLOSE:
-               __pUserConfirmPopup.reset();
+       case ID_USER_CONFIRM_USERMEDIA_CLOSE:
+               __pUserMediaConfirmPopup.reset();
+               break;
+       case ID_USER_CONFIRM_GEOLOCATION_CLOSE:
+               __pGeolocationConfirmPopup.reset();
+               break;
+       case ID_USER_CONFIRM_NOTIFICATION_CLOSE:
+               __pNotificationConfirmPopup.reset();
+               break;
+       case ID_USER_SCRIPT_ALERT_CLOSE:
+               __pScriptAlertConfirmPopup.reset();
+               break;
+       case ID_USER_SCRIPT_CONFIRM_CLOSE:
+               __pScriptConfirmPopup.reset();
                break;
        default:
                break;
        }
+
+       Resume();
 }
 
 
@@ -4866,6 +5018,8 @@ _WebImpl::HideColorPicker(void)
 {
        __pColorPicker.reset();
 
+       Resume();
+
        return EINA_TRUE;
 }
 
@@ -4888,12 +5042,17 @@ _WebImpl::ShowColorPicker(int red, int green, int blue, int alpha, Color& color)
        r = __pColorPicker->ShowPopup();
        SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       color = __pColorPicker->GetColor();
-
-       return E_SUCCESS;
+       if (__pColorPicker)
+       {
+               color = __pColorPicker->GetColor();
+       }
 
 CATCH:
-       __pColorPicker.reset();
+       if (__pColorPicker)
+       {
+               __pColorPicker.reset();
+               Resume();
+       }
 
        return r;
 }
@@ -4915,10 +5074,17 @@ _WebImpl::ShowDatePicker(Ewk_Input_Type inputType, const char* inputValue, Strin
        r = __pDatePicker->ShowPopup();
        SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       dateStr = __pDatePicker->GetDate();
+       if (__pDatePicker)
+       {
+               dateStr = __pDatePicker->GetDate();
+       }
 
 CATCH:
-       __pDatePicker.reset();
+       if (__pDatePicker)
+       {
+               __pDatePicker.reset();
+               Resume();
+       }
 
        return r;
 }
@@ -5232,4 +5398,18 @@ _WebImpl::HideFormDataWindow(bool delWindow)
 }
 
 
+void
+_WebImpl::ClearWebNotification(_WebNotification* pWebNotification)
+{
+       __webNotificationList.Remove(*pWebNotification);
+}
+
+
+void
+_WebImpl::SetWebNotification(_WebNotification* pWebNotification)
+{
+       __webNotificationList.Add(pWebNotification);
+}
+
+
 }}} // Tizen::Web::Controls