From 86daf9e9f4a4ec7fffd9b80556243f16ff1239ee Mon Sep 17 00:00:00 2001
From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Fri, 16 Aug 2013 11:02:19 +0900
Subject: [PATCH] add patch

---
 inc/FWebCtrlWeb.h                                  |  69 +++-
 packaging/osp-web.spec                             |   1 +
 src/FWeb_WebBookmarkImpl.cpp                       |   3 +-
 .../FWebCtrlGeolocationPermissionManager.cpp       |   1 +
 src/controls/FWebCtrlWebStorageManager.cpp         |   1 +
 src/controls/FWebCtrl_AppControlListener.cpp       |   6 +-
 src/controls/FWebCtrl_AuthConfirmPopup.cpp         |  14 +-
 src/controls/FWebCtrl_CertificateConfirmPopup.cpp  |  79 +++--
 src/controls/FWebCtrl_GestureState.cpp             |   4 +-
 src/controls/FWebCtrl_InputPickerPopup.cpp         |   6 +-
 src/controls/FWebCtrl_PromptPopup.cpp              |   8 +-
 src/controls/FWebCtrl_SelectBox.cpp                | 104 +++---
 src/controls/FWebCtrl_SelectBox.h                  |   4 +-
 src/controls/FWebCtrl_UserConfirmPopup.cpp         |  50 ++-
 src/controls/FWebCtrl_Web.cpp                      |  40 +++
 src/controls/FWebCtrl_Web.h                        |   6 +
 src/controls/FWebCtrl_WebImpl.cpp                  | 368 ++++++++++-----------
 src/controls/FWebCtrl_WebManager.cpp               |  67 ++++
 src/controls/FWebCtrl_WebManager.h                 |  11 +-
 src/controls/FWebCtrl_WebPopup.cpp                 |  22 +-
 .../inc/FWebCtrl_CertificateConfirmPopup.h         |   8 +-
 src/controls/inc/FWebCtrl_UserConfirmPopup.h       |   5 +-
 src/controls/inc/FWebCtrl_WebImpl.h                |  18 +-
 src/controls/inc/FWebCtrl_WebPopup.h               |   2 +
 24 files changed, 594 insertions(+), 303 deletions(-)
 mode change 100644 => 100755 src/controls/FWebCtrl_WebPopup.cpp

diff --git a/inc/FWebCtrlWeb.h b/inc/FWebCtrlWeb.h
index fa22d82..e2ff11e 100755
--- a/inc/FWebCtrlWeb.h
+++ b/inc/FWebCtrlWeb.h
@@ -72,7 +72,7 @@ namespace Tizen { namespace Web { namespace Controls
  *
  * The following example demonstrates how to use the %Web class.
  *	@code
-// Sample code for WebSample.h
+// Sample code using Form for WebSample.h
 #include <FUi.h>
 #include <FWeb.h>
 
@@ -93,7 +93,7 @@ public:
     virtual result OnInitializing(void);
 };
 
-// Sample code for WebSample.cpp
+// Sample code using Form for WebSample.cpp
 #include "WebSample.h"
 
 using namespace Tizen::Ui;
@@ -105,9 +105,13 @@ WebSample::OnInitializing(void)
 {
     result r = E_SUCCESS;
 
+    // Constucts a Form
+    ...
+
     __pWeb = new Web();
     __pWeb->Construct(GetClientAreaBounds());
     AddControl(__pWeb);
+
     LoadUrl();
 
     return r;
@@ -123,6 +127,67 @@ WebSample::LoadUrl(void)
 }
  *	@endcode
  *
+ *	@code
+// Sample code using Window for WebSample.h
+#include <FApp.h>
+#include <FUi.h>
+#include <FWeb.h>
+
+class WebSample :
+    public Tizen::Ui::Window
+{
+public:
+    WebSample(void) {};
+    virtual ~WebSample(void) {};
+
+protected:
+    void LoadUrl(void);
+
+private:
+    Tizen::Web::Controls::Web *__pWeb;
+
+public:
+    virtual result OnInitializing(void);
+};
+
+// Sample code using Window for WebSample.cpp
+#include "WebSample.h"
+
+using namespace Tizen::App;
+using namespace Tizen::Ui;
+using namespace Tizen::Ui::Controls;
+using namespace Tizen::Web::Controls;
+
+result
+WebSample::OnInitializing(void)
+{
+    result r = E_SUCCESS;
+
+    // Constucts a Window
+    ...
+
+    Frame *pFrame = UiApp::GetInstance()->GetAppFrame()->GetFrame();
+    SetOwner(pFrame->GetCurrentForm());
+
+    __pWeb = new Web();
+    __pWeb->Construct(GetClientAreaBounds());
+    AddControl(__pWeb);
+
+    Show();
+    LoadUrl();
+
+    return r;
+}
+
+// Calls LoadUrl() with the URL of the Web content to display it on the Web control
+void
+WebSample::LoadUrl(void)
+{
+    Tizen::Base::String url(L"http://www.tizen.org");
+
+    __pWeb->LoadUrl(url);
+}
+ *	@endcode
  */
 class _OSP_EXPORT_ Web
 	: public Tizen::Ui::Container
diff --git a/packaging/osp-web.spec b/packaging/osp-web.spec
index 8ae7b4f..cf9b7e7 100755
--- a/packaging/osp-web.spec
+++ b/packaging/osp-web.spec
@@ -1,3 +1,4 @@
+%define debug_package %{nil}
 %define __strip /bin/true
 
 Name:		osp-web
diff --git a/src/FWeb_WebBookmarkImpl.cpp b/src/FWeb_WebBookmarkImpl.cpp
index caed0aa..f456449 100755
--- a/src/FWeb_WebBookmarkImpl.cpp
+++ b/src/FWeb_WebBookmarkImpl.cpp
@@ -72,6 +72,7 @@ _WebBookmarkImpl::_WebBookmarkImpl(void)
 
 _WebBookmarkImpl::~_WebBookmarkImpl(void)
 {
+	__bookmarkList.RemoveAll(true);
 }
 
 
@@ -153,7 +154,7 @@ _WebBookmarkImpl::SetFavicon(RecordId bookmarkId, const Bitmap& favicon)
 
 	Evas_Object* pIcon = null;
 
-	Bitmap& temp = const_cast< Bitmap& >(favicon);;
+	Bitmap& temp = const_cast< Bitmap& >(favicon);
 
 	Evas* pEvas = _Utility::GetEvasFromUiApp(pFrame);
 	SysTryCatch(NID_WEB, pEvas, r = GetLastResult(), r, "[%s] Propagating.", GetErrorMessage(r));
diff --git a/src/controls/FWebCtrlGeolocationPermissionManager.cpp b/src/controls/FWebCtrlGeolocationPermissionManager.cpp
index d30dc34..d85ced9 100755
--- a/src/controls/FWebCtrlGeolocationPermissionManager.cpp
+++ b/src/controls/FWebCtrlGeolocationPermissionManager.cpp
@@ -21,6 +21,7 @@
  *
  * The file contains the definition of GeolocationPermissionManager class.
  */
+#include <pthread.h>
 #include <unique_ptr.h>
 #include <FBaseColIList.h>
 #include <FBaseSysLog.h>
diff --git a/src/controls/FWebCtrlWebStorageManager.cpp b/src/controls/FWebCtrlWebStorageManager.cpp
index c0d43af..518f66e 100755
--- a/src/controls/FWebCtrlWebStorageManager.cpp
+++ b/src/controls/FWebCtrlWebStorageManager.cpp
@@ -21,6 +21,7 @@
  *
  * The file contains the definition of FWebCtrlWebStorageManager class.
  */
+#include <pthread.h>
 #include <unique_ptr.h>
 #include <FBaseColIList.h>
 #include <FBaseSysLog.h>
diff --git a/src/controls/FWebCtrl_AppControlListener.cpp b/src/controls/FWebCtrl_AppControlListener.cpp
index 995f0ca..5b2929e 100755
--- a/src/controls/FWebCtrl_AppControlListener.cpp
+++ b/src/controls/FWebCtrl_AppControlListener.cpp
@@ -122,12 +122,12 @@ _MediaSelectionListener::~_MediaSelectionListener(void)
 void
 _MediaSelectionListener::OnAppControlCompleteResponseReceived(const Tizen::App::AppId& providerId, const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pAppData)
 {
-	SysTryReturnVoidResult(NID_WEB_CTRL, pAppData, E_INVALID_ARG, "[E_INVALID_ARG] Invalid arguments to _MediaSelectionListener::OnAppControlCompleted");
-
 	Eina_List* pSelectedFileNames = null;
+	ArrayList* pSelectedFiles = null;
 	int fileCount = 0;
 
-	ArrayList *pSelectedFiles = dynamic_cast< ArrayList* >(const_cast< Object* >(pAppData->GetValue(String("http://tizen.org/appcontrol/data/selected"))));
+	SysTryCatch(NID_WEB_CTRL, pAppData, , E_INVALID_ARG, "[E_INVALID_ARG] Invalid arguments to _MediaSelectionListener::OnAppControlCompleted");
+	pSelectedFiles = dynamic_cast< ArrayList* >(const_cast< Object* >(pAppData->GetValue(String("http://tizen.org/appcontrol/data/selected"))));
 	SysTryCatch(NID_WEB_CTRL, pSelectedFiles, , E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
 	fileCount = pSelectedFiles->GetCount();
diff --git a/src/controls/FWebCtrl_AuthConfirmPopup.cpp b/src/controls/FWebCtrl_AuthConfirmPopup.cpp
index 271c78b..de447c4 100755
--- a/src/controls/FWebCtrl_AuthConfirmPopup.cpp
+++ b/src/controls/FWebCtrl_AuthConfirmPopup.cpp
@@ -93,7 +93,7 @@ _AuthConfirmPopup::Construct(const String& host, const String& realm, Authentica
 	r = _WebPopup::Construct(true, Dimension(rect.width, rect.height));
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-	SetTitleText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_DESTINATIONS_AUTHENTICATION_REQUIRED"));
+	SetTitleText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_HEADER_ENTER_CREDENTIALS_ABB"));
 
 	//host realm label
 	rect.height = 2*pPopupData->labelDim.height;
@@ -127,7 +127,7 @@ _AuthConfirmPopup::Construct(const String& host, const String& realm, Authentica
 	r = pIdEditField->Construct(rect, EDIT_FIELD_STYLE_NORMAL);
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-	pIdEditField->SetGuideText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_AUTHUSERNAME"));
+	pIdEditField->SetGuideText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_WIFI_BODY_ENTER_YOUR_ID"));
 	pIdEditField->SetGuideTextColor(Color::GetColor(COLOR_ID_GREY));
 	pIdEditField->SetTextSize(EDIT_TEXT_SIZE);;
 
@@ -142,7 +142,7 @@ _AuthConfirmPopup::Construct(const String& host, const String& realm, Authentica
 	r = pPwdEditField->Construct(rect, EDIT_FIELD_STYLE_PASSWORD);
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-	pPwdEditField->SetGuideText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_AUTHPASSWORD"));
+	pPwdEditField->SetGuideText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_ENTER_YOUR_PASSWORD_ABB"));
 	pPwdEditField->SetGuideTextColor(Color::GetColor(COLOR_ID_GREY));
 	pPwdEditField->SetTextSize(EDIT_TEXT_SIZE);;
 
@@ -165,8 +165,8 @@ _AuthConfirmPopup::Construct(const String& host, const String& realm, Authentica
 	ArrayList titleList;
 	r = titleList.Construct();
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-	titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_COM_SK_CANCEL"))));
-	titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_COM_BUTTON_LOGIN"))));
+	titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON_CANCEL_ABB"))));
+	titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON_CONTINUE_ABB"))));
 
 	r = CreateAndAddButtons(idList, titleList, pButtonPanel);
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -214,7 +214,7 @@ _AuthConfirmPopup::OnActionPerformed(const Control& source, int actionId)
 bool
 _AuthConfirmPopup::OnKeyPressed(Control& source, const KeyEventInfo& keyEventInfo)
 {
-	return true;
+	return false;
 }
 
 bool
@@ -231,7 +231,7 @@ _AuthConfirmPopup::OnKeyReleased(Control& source, const KeyEventInfo& keyEventIn
 		}
 	}
 
-	return true;
+	return false;
 }
 
 bool
diff --git a/src/controls/FWebCtrl_CertificateConfirmPopup.cpp b/src/controls/FWebCtrl_CertificateConfirmPopup.cpp
index e49cb4b..52d9ba9 100755
--- a/src/controls/FWebCtrl_CertificateConfirmPopup.cpp
+++ b/src/controls/FWebCtrl_CertificateConfirmPopup.cpp
@@ -66,6 +66,8 @@ _CertificateConfirmPopup::_CertificateConfirmPopup(void)
 						: __certPopupMode(CERTIFICATE_POPUP_MODE_USER_CONFIRM)
 						, __confirm(false)
 						, __pCertificatePolicyData(null)
+						, __pParent(null)
+						, __pCertificatePopup(null)
 {
 }
 
@@ -80,7 +82,7 @@ _CertificateConfirmPopup::~_CertificateConfirmPopup(void)
 
 
 result
-_CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Certificate_Policy_Decision* pPolicy)
+_CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Certificate_Policy_Decision* pPolicy, Tizen::Web::Controls::_CertificateConfirmPopup* pParent)
 {
 	SysTryReturnResult(NID_WEB_CTRL, pPolicy, E_INVALID_ARG, "Certificate Policy pointer is null.");
 	result r = E_SUCCESS;
@@ -97,6 +99,8 @@ _CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Cer
 	int popupMaxHeight = 0;
 	Rectangle rect(0, 0, 0, 0);
 
+	__pParent = pParent;
+
 	ArrayList idList;
 	r = idList.Construct();
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -107,18 +111,18 @@ _CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Cer
 
 	if( __certPopupMode == CERTIFICATE_POPUP_MODE_VIEW )
 	{
-		titleText = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_CERTIFICATES");
+		titleText = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_HEADER_SECURITY_CERTIFICATE_ABB");
 		popupMaxHeight = 4*pPopupData->labelDim.height + pPopupData->btnDim.height + 2*pPopupData->sideMargin;
 
 		rect.height = 4*pPopupData->labelDim.height;
 		rect.width = pPopupData->labelDim.width;
 
 		idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_CLOSE)));
-		titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_COM_BODY_DONE"))));
+		titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_TPLATFORM_BUTTON_OK"))));
 	}
 	else	// CERTIFICATE_POPUP_MODE_CONFIRM
 	{
-		titleText = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_SECURITY_WARNING");
+		titleText = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_HEADER_SECURITY_WARNING_ABB");
 		popupMaxHeight = 2*pPopupData->labelDim.height + pPopupData->btnDim.height + 2*pPopupData->sideMargin;
 
 		rect.height = 2*pPopupData->labelDim.height;
@@ -128,9 +132,9 @@ _CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Cer
 		idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_VIEW)));
 		idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_ALLOW)));
 
-		titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_CANCEL"))));
-		titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_VIEW"))));
-		titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_ALLOW"))));
+		titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON_CANCEL_ABB"))));
+		titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON2_VIEW_CERTIFICATE"))));
+		titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON_CONTINUE_ABB"))));
 	}
 
 	r = _WebPopup::Construct(true, Dimension(pPopupData->popupDim.width, popupMaxHeight));
@@ -174,7 +178,7 @@ _CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Cer
 		SysTryReturnResult(NID_WEB_CTRL, pLabel.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
 
 		String message = L"";
-		message = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_SECURITY_CERTIFICATE_PROBLEM_MSG");
+		message = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_THERE_ARE_PROBLEMS_WITH_THE_SECURITY_CERTIFICATE_FOR_THIS_SITE_C");
 		message.Append(L"\n");
 		message.Append(ewk_certificate_policy_decision_url_get(__pCertificatePolicyData));
 
@@ -222,13 +226,14 @@ _CertificateConfirmPopup::OnActionPerformed(const Control& source, int actionId)
 		std::unique_ptr<_CertificateConfirmPopup> pCertificatePopup(new (std::nothrow) _CertificateConfirmPopup());
 		SysTryReturnVoidResult(NID_WEB_CTRL, pCertificatePopup.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
 
-		r = pCertificatePopup->Construct(CERTIFICATE_POPUP_MODE_VIEW, __pCertificatePolicyData);
+		r = pCertificatePopup->Construct(CERTIFICATE_POPUP_MODE_VIEW, __pCertificatePolicyData, this);
 		SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
-		r = pCertificatePopup->ShowPopup();
-		SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
+		__pCertificatePopup = std::move(pCertificatePopup);
 
-		pCertificatePopup.release();
+		r = __pCertificatePopup->ShowPopup();
+		SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
+		__pCertificatePopup.release();
 		return;
 	}
 
@@ -249,16 +254,32 @@ _CertificateConfirmPopup::OnActionPerformed(const Control& source, int actionId)
 	{
 		SysLogException(NID_WEB_CTRL, r, "[%s] Propagating.", GetErrorMessage(r));
 	}
-	if (__certPopupMode == CERTIFICATE_POPUP_MODE_VIEW )
+	if (__certPopupMode == CERTIFICATE_POPUP_MODE_VIEW)
 	{
-		GetOwner()->SendUserEvent(ID_CERTIFICATE_CONFIRM_POPUP_CLOSE, null);
+		__pParent->SendUserEvent(ID_CERTIFICATE_CONFIRM_POPUP_CLOSE, null);
 	}
 }
 
+
+void
+_CertificateConfirmPopup::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
+{
+	switch (requestId)
+	{
+	case ID_CERTIFICATE_CONFIRM_POPUP_CLOSE:
+		__pCertificatePopup.reset();
+		break;
+	default:
+		break;
+	}
+
+}
+
+
 bool
 _CertificateConfirmPopup::OnKeyPressed(Control& source, const KeyEventInfo& keyEventInfo)
 {
-	return true;
+	return false;
 }
 
 bool
@@ -276,13 +297,13 @@ _CertificateConfirmPopup::OnKeyReleased(Control& source, const KeyEventInfo& key
 		{
 			SysLogException(NID_WEB_CTRL, r, "[%s] Propagating.", GetErrorMessage(r));
 		}
-		if (__certPopupMode == CERTIFICATE_POPUP_MODE_VIEW )
+		if (__certPopupMode == CERTIFICATE_POPUP_MODE_VIEW)
 		{
-			GetOwner()->SendUserEvent(ID_CERTIFICATE_CONFIRM_POPUP_CLOSE, null);
+			__pParent->SendUserEvent(ID_CERTIFICATE_CONFIRM_POPUP_CLOSE, null);
 		}
 	}
 
-	return true;
+	return false;
 }
 
 bool
@@ -364,45 +385,45 @@ _CertificateConfirmPopup::GenerateCertifiate(String& certString)
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
 	//Issued to
-	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ISSUED_TO_C"));
+	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_ISSUED_TO_C"));
 	certString.Append(L"\n\n");
 	String subject = certificate.GetSubject();
 
-	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_COMMON_NAME_C"));
+	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_COMMON_NAME_C"));
 	certString.Append(L"\n");
 	certString.Append(GetStringOfToken(subject, L"/CN=") + L"\n");
 
-	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ORGANIZATION_C"));
+	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_ORGANISATION_C"));
 	certString.Append(L"\n");
 	certString.Append(GetStringOfToken(subject, L"/O=") + L"\n");
 
-	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP ,"IDS_BR_HEADER_ORGANIZATIONAL_UNIT_C"));
+	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP ,"IDS_TPLATFORM_BODY_ORGANISATIONAL_UNIT_C"));
 	certString.Append(L"\n");
 	certString.Append(GetStringOfToken(subject, L"/OU=") + L"\n");
 
-	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_CERTIFICATE_SERIAL_NUMBER"));
+	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_SERIAL_NUMBER_C"));
 	certString.Append(L":\n");
 	certString.Append(certificate.GetSerialNumber() + L"\n\n\n");
 
 	//Issued by
-	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ISSUED_BY_C"));
+	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_ISSUED_BY_C"));
 	certString.Append(L"\n\n");
 	String issuer = certificate.GetIssuer();
 
-	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_COMMON_NAME_C"));
+	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_COMMON_NAME_C"));
 	certString.Append(L"\n");
 	certString.Append(GetStringOfToken(issuer, L"/CN=") + L"\n");
 
-	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ORGANIZATION_C"));
+	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_ORGANISATION_C"));
 	certString.Append(L"\n");
 	certString.Append(GetStringOfToken(issuer, L"/O=") + L"\n");
 
-	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ORGANIZATIONAL_UNIT_C"));
+	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_ORGANISATIONAL_UNIT_C"));
 	certString.Append(L"\n");
 	certString.Append(GetStringOfToken(issuer, L"/OU=") + L"\n\n");
 
 	//Validity
-	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_VALIDITY_C"));
+	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_VALIDITY_C"));
 	certString.Append(L"\n\n");
 	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_POP_CERTI_VALID_FROM_C"));
 	certString.Append(L"\n");
@@ -413,7 +434,7 @@ _CertificateConfirmPopup::GenerateCertifiate(String& certString)
 	certString.Append(certificate.GetNotAfter() + L"\n\n\n");
 
 	//FingerPrints
-	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_ROOTCERTIFICATES_FINGER_PRINT"));
+	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_FINGERPRINTS_C"));
 	certString.Append(L":\n\n");
 	certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_SIGNATURE_ALGORITHM_VODA"));
 	certString.Append(L":\n");
diff --git a/src/controls/FWebCtrl_GestureState.cpp b/src/controls/FWebCtrl_GestureState.cpp
index c17df52..93419bd 100755
--- a/src/controls/FWebCtrl_GestureState.cpp
+++ b/src/controls/FWebCtrl_GestureState.cpp
@@ -100,12 +100,12 @@ _TapGestureState::OnLongPressGestureDetected(_TouchLongPressGestureDetector& ges
 	pPoint->id = 0;
 	pPoint->x = absPoint.x;
 	pPoint->y = absPoint.y;
-	pPoint->state = EVAS_TOUCH_POINT_UP;
+	pPoint->state = EVAS_TOUCH_POINT_CANCEL;
 
 	Eina_List* pPointList = null;
 	pPointList = eina_list_append(pPointList, pPoint);
 
-	ewk_view_feed_touch_event(__pWebCore->GetWebNativeNode(), EWK_TOUCH_END, pPointList, null);
+	ewk_view_feed_touch_event(__pWebCore->GetWebNativeNode(), EWK_TOUCH_CANCEL, pPointList, null);
 
 	void* pData = null;
 	EINA_LIST_FREE(pPointList, pData)
diff --git a/src/controls/FWebCtrl_InputPickerPopup.cpp b/src/controls/FWebCtrl_InputPickerPopup.cpp
index c652f10..0826358 100755
--- a/src/controls/FWebCtrl_InputPickerPopup.cpp
+++ b/src/controls/FWebCtrl_InputPickerPopup.cpp
@@ -323,7 +323,7 @@ _InputPickerPopup::AddButton(_InputPickerButtonId buttonId)
 	_SystemResource* pSysResource = _SystemResource::GetInstance();
 	SysAssertf(pSysResource != null, "Failed to get _SystemResource instance");
 
-	buttonStr = pSysResource->GetString("sys_string", "IDS_COM_SK_OK");
+	buttonStr = pSysResource->GetString("sys_string", "IDS_TPLATFORM_BUTTON_OK");
 
 	std::unique_ptr<Button> pSelectionBtn(new (std::nothrow) Button());
 	SysTryReturnResult(NID_WEB_CTRL, pSelectionBtn.get(), E_OUT_OF_MEMORY, "Memory Allocation Failed.");
@@ -511,7 +511,7 @@ _InputPickerPopup::HidePopup(void)
 bool
 _InputPickerPopup::OnKeyPressed(Control& source, const KeyEventInfo& keyEventInfo)
 {
-	return true;
+	return false;
 }
 
 bool
@@ -522,7 +522,7 @@ _InputPickerPopup::OnKeyReleased(Control& source, const KeyEventInfo& keyEventIn
 		HidePopup();
 	}
 
-	return true;
+	return false;
 }
 
 bool
diff --git a/src/controls/FWebCtrl_PromptPopup.cpp b/src/controls/FWebCtrl_PromptPopup.cpp
index d59c671..39f3a6c 100755
--- a/src/controls/FWebCtrl_PromptPopup.cpp
+++ b/src/controls/FWebCtrl_PromptPopup.cpp
@@ -149,8 +149,8 @@ _PromptPopup::Construct(const String& message, const String& defaultVale,  Evas_
 	ArrayList titleList;
 	r = titleList.Construct();
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-	titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_COM_POP_CANCEL"))));
-	titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_COM_SK_OK"))));
+	titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_TPLATFORM_BUTTON_CANCEL_ABB"))));
+	titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_TPLATFORM_BUTTON_OK"))));
 
 	r = CreateAndAddButtons(idList, titleList, pButtonPanel);
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -205,7 +205,7 @@ _PromptPopup::OnActionPerformed(const Control& source, int actionId)
 bool
 _PromptPopup::OnKeyPressed(Control& source, const KeyEventInfo& keyEventInfo)
 {
-	return true;
+	return false;
 }
 
 bool
@@ -218,7 +218,7 @@ _PromptPopup::OnKeyReleased(Control& source, const KeyEventInfo& keyEventInfo)
 		__pImpl->SendUserEvent(ID_PROMPT_POPUP_CLOSE, null);
 	}
 
-	return true;
+	return false;
 }
 
 bool
diff --git a/src/controls/FWebCtrl_SelectBox.cpp b/src/controls/FWebCtrl_SelectBox.cpp
index 0a6e241..b1e8462 100755
--- a/src/controls/FWebCtrl_SelectBox.cpp
+++ b/src/controls/FWebCtrl_SelectBox.cpp
@@ -26,6 +26,7 @@
 #include <unique_ptr.h>
 #include <FBaseColAllElementsDeleter.h>
 #include <FBaseSysLog.h>
+#include <FCntDownloadRequest.h>
 #include <FGrpDimension.h>
 #include <FGrpRectangle.h>
 #include <FUiCtrlButton.h>
@@ -37,6 +38,7 @@
 #include <FUiIActionEventListener.h>
 #include <FUiKeyEventInfo.h>
 #include <FUiVerticalBoxLayout.h>
+#include <FCnt_DownloadManagerImpl.h>
 #include <FSys_SystemResource.h>
 #include <FUi_ResourceManager.h>
 #include "FWebCtrl_SelectBox.h"
@@ -44,6 +46,7 @@
 
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
+using namespace Tizen::Content;
 using namespace Tizen::Graphics;
 using namespace Tizen::System;
 using namespace Tizen::Ui;
@@ -147,6 +150,7 @@ _SelectBox::_SelectBox(void)
 	, __orientation(_CONTROL_ORIENTATION_PORTRAIT)
 	, __pWebView(null)
 	, __pToggledArray(null)
+	, __url(L"")
 {
 }
 
@@ -164,7 +168,7 @@ _SelectBox::~_SelectBox(void)
 
 
 result
-_SelectBox::Construct(bool isMultiSelect, const String& title, int listCount, Evas_Object* pWebView)
+_SelectBox::Construct(bool isMultiSelect, const String& title, int listCount, Evas_Object* pWebView, const String& url)
 {
 	result r = E_SUCCESS;
 	Rectangle rect;
@@ -174,6 +178,7 @@ _SelectBox::Construct(bool isMultiSelect, const String& title, int listCount, Ev
 	int listViewHeight = 0;
 
 	__pWebView = pWebView;
+	__url = const_cast< String& >(url);
 
 	GET_SHAPE_CONFIG(CONTEXTMENU::LIST_ITEM_HEIGHT, __orientation, listItemHeight);
 
@@ -236,10 +241,10 @@ _SelectBox::Construct(bool isMultiSelect, const String& title, int listCount, Ev
 	r = titleList.Construct();
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-	titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_COM_POP_CANCEL"))));
+	titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_TPLATFORM_BUTTON_CANCEL_ABB"))));
 	if (__multiSelection)
 	{
-		titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_COM_BODY_DONE"))));
+		titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_TPLATFORM_BUTTON_OK"))));
 
 		__pToggledArray = eina_inarray_new(sizeof(int), 0);
 		SysTryReturnResult(NID_WEB_CTRL, __pToggledArray, E_OUT_OF_MEMORY, "Memory Allocation failed.");
@@ -420,14 +425,30 @@ _SelectBox::OnListViewItemStateChanged(ListView& listView, int index, int elemen
 	else
 	{
 		//In case of single selection ... update the index.
-		__SelectedIndex = index;
-		SysLog(NID_WEB_CTRL,"The current value of Update Selected index is %d",index);
-		if (__pWebView)
+		if (__url.GetLength() == 0)
 		{
-			ewk_view_popup_menu_select(__pWebView, __SelectedIndex);
+			__SelectedIndex = index;
+			SysLog(NID_WEB_CTRL,"The current value of Update Selected index is %d",index);
+			if (__pWebView)
+			{
+				ewk_view_popup_menu_select(__pWebView, __SelectedIndex);
+			}
+		}
+		else
+		{
+			result r = E_SUCCESS;
+
+			RequestId reqId = 0;
+			DownloadRequest request(__url);
+
+			_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));
 		}
 
-		result r = HidePopup(__SelectedIndex);
+		result r = HidePopup();
 		SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 	}
 }
@@ -443,37 +464,40 @@ _SelectBox::OnListViewItemSwept(ListView& listView, int index, SweepDirection di
 void
 _SelectBox::OnActionPerformed(const Control& source, int actionId)
 {
-	switch (actionId)
-	{
-	case ID_BUTTON_SELECTION:
-	{
-		ewk_view_popup_menu_multiple_select(__pWebView, __pToggledArray);
-		break;
-	}
-	case ID_BUTTON_CANCEL:
+	result r = HidePopup();
+	SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
+
+	if (__url.GetLength() == 0)
 	{
-		if (__multiSelection)
+		switch (actionId)
 		{
-			ewk_view_popup_menu_multiple_select(__pWebView, null);
+		case ID_BUTTON_SELECTION:
+		{
+			ewk_view_popup_menu_multiple_select(__pWebView, __pToggledArray);
+			break;
 		}
-		else
+		case ID_BUTTON_CANCEL:
 		{
-			ewk_view_popup_menu_select(__pWebView, __prevIndex);
+			if (__multiSelection)
+			{
+				ewk_view_popup_menu_multiple_select(__pWebView, null);
+			}
+			else
+			{
+				ewk_view_popup_menu_select(__pWebView, __prevIndex);
+			}
+			break;
+		}
+		default:
+			SysAssertf(false, "Invalid Action ID");
 		}
-		break;
-	}
-	default:
-		SysAssertf(false, "Invalid Action ID");
 	}
-
-	result r = HidePopup(__SelectedIndex);
-	SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 }
 
 bool
 _SelectBox::OnKeyPressed(Control& source, const KeyEventInfo& keyEventInfo)
 {
-	return true;
+	return false;
 }
 
 bool
@@ -481,22 +505,26 @@ _SelectBox::OnKeyReleased(Control& source, const KeyEventInfo& keyEventInfo)
 {
 	if ((keyEventInfo.GetKeyCode() == KEY_ESC || keyEventInfo.GetKeyCode() == KEY_BACK) && source.GetShowState() == true)
 	{
-		if (__multiSelection)
-		{
-			ewk_view_popup_menu_multiple_select(__pWebView, null);
-		}
-		else
-		{
-			ewk_view_popup_menu_select(__pWebView, __prevIndex);
-		}
-		result r = HidePopup(__SelectedIndex);
+		result r = HidePopup();
 		if (IsFailed(r))
 		{
 			SysLogException(NID_WEB_CTRL, r, "[%s] Propagating.", GetErrorMessage(r));
 		}
+
+		if (__url.GetLength() == 0)
+		{
+			if (__multiSelection)
+			{
+				ewk_view_popup_menu_multiple_select(__pWebView, null);
+			}
+			else
+			{
+				ewk_view_popup_menu_select(__pWebView, __prevIndex);
+			}
+		}		
 	}
 
-	return true;
+	return false;
 }
 
 bool
diff --git a/src/controls/FWebCtrl_SelectBox.h b/src/controls/FWebCtrl_SelectBox.h
index ff85090..1b2f59c 100755
--- a/src/controls/FWebCtrl_SelectBox.h
+++ b/src/controls/FWebCtrl_SelectBox.h
@@ -60,7 +60,6 @@ enum _ButtonFormat
 	ID_BUTTON_CANCEL
 };
 
-
 class _SelectBox
 	: public _WebPopup
 	, public Tizen::Ui::Controls::IListViewItemEventListener
@@ -78,7 +77,7 @@ public:
 	 */
 	virtual ~_SelectBox(void);
 
-	result Construct(bool isMultiSelect, const Tizen::Base::String& title, int listItemCnt, Evas_Object* pWebView = null);
+	result Construct(bool isMultiSelect, const Tizen::Base::String& title, int listItemCnt, Evas_Object* pWebView = null, const Tizen::Base::String& url = L"");
 	Tizen::Base::Collection::IList* GetSelectedListN(void) const;
 
 	//IListViewItemProvider
@@ -132,6 +131,7 @@ private:
 	Tizen::Ui::_ControlOrientation __orientation;
 	Evas_Object* __pWebView;
 	Eina_Inarray* __pToggledArray;
+	Tizen::Base::String __url;
 }; // _SelectBox
 
 }}} //Tizen::Web::Controls
diff --git a/src/controls/FWebCtrl_UserConfirmPopup.cpp b/src/controls/FWebCtrl_UserConfirmPopup.cpp
index 0f79b18..e5f6c11 100755
--- a/src/controls/FWebCtrl_UserConfirmPopup.cpp
+++ b/src/controls/FWebCtrl_UserConfirmPopup.cpp
@@ -19,6 +19,7 @@
  * @file		FWebCtrl_UserConfirmPopup.cpp
  * @brief		The file contains the definition of _UserConfirmPopup class.
  */
+#include <EWebKit2.h>
 #include <FAppApp.h>
 #include <FBaseColArrayList.h>
 #include <FBaseSysLog.h>
@@ -64,12 +65,14 @@ _UserConfirmPopup::_UserConfirmPopup(void)
 	, __userConfirmMode(USER_CONFIRM_USERMEDIA)
 	, __pCheckButton(null)
 	, __sync(false)
+	, __pImpl(null)
 {
 }
 
 
 _UserConfirmPopup::~_UserConfirmPopup(void)
 {
+	
 	if (IsModalPopup())
 	{
 		HandleUserAction(EINA_FALSE);
@@ -78,7 +81,7 @@ _UserConfirmPopup::~_UserConfirmPopup(void)
 
 
 result
-_UserConfirmPopup::Construct(_UserConfirmMode userConfirmMode, void* pEventInfo, bool sync, String msg)
+_UserConfirmPopup::Construct(_UserConfirmMode userConfirmMode, void* pEventInfo, Tizen::Web::Controls::_WebImpl* pImpl, bool sync, String msg)
 {
 	result r = E_SUCCESS;
 	SysTryReturnResult(NID_WEB_CTRL, pEventInfo, E_INVALID_ARG, "Invalid argument(s) is used. pPolicy is null.");
@@ -98,6 +101,9 @@ _UserConfirmPopup::Construct(_UserConfirmMode userConfirmMode, void* pEventInfo,
 	bool hasTitle = true;
 	int popupMaxHeight = 2*pPopupData->labelDim.height + pPopupData->btnDim.height + 2*pPopupData->sideMargin;
 
+	__pImpl = pImpl;
+	SysAssertf(__pImpl != null, "Failed to get _WebImpl");
+
 	if (__userConfirmMode == USER_CONFIRM_GEOLOCATION)
 	{
 		popupMaxHeight +=  pPopupData->checkDim.height;
@@ -114,7 +120,7 @@ _UserConfirmPopup::Construct(_UserConfirmMode userConfirmMode, void* pEventInfo,
 
 	if (userConfirmMode != USER_SCRIPT_ALERT)
 	{
-		SetTitleText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_SECURITY_WARNING"));
+		SetTitleText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_HEADER_SECURITY_WARNING_ABB"));
 	}
 
 	Rectangle rect(0, 0, 0, 0);
@@ -182,8 +188,8 @@ _UserConfirmPopup::Construct(_UserConfirmMode userConfirmMode, void* pEventInfo,
 	{
 		idList.Add(*(new Integer(ID_BUTTON_USER_CANCEL)));
 		idList.Add(*(new Integer(ID_BUTTON_USER_ALLOW)));
-		titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_CANCEL"))));
-		titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_ALLOW"))));
+		titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON_CANCEL_ABB"))));
+		titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON_CONTINUE_ABB"))));
 	}
 
 	r = CreateAndAddButtons(idList, titleList, pButtonPanel);
@@ -240,22 +246,27 @@ _UserConfirmPopup::OnActionPerformed(const Control& source, int actionId)
 		{
 		case USER_CONFIRM_USERMEDIA:
 		{
-			GetOwner()->SendUserEvent(ID_USER_CONFIRM_USERMEDIA_CLOSE, null);
+			__pImpl->SendUserEvent(ID_USER_CONFIRM_USERMEDIA_CLOSE, null);
 			break;
 		}
 		case USER_CONFIRM_GEOLOCATION:
 		{
-			GetOwner()->SendUserEvent(ID_USER_CONFIRM_GEOLOCATION_CLOSE, null);
+			__pImpl->SendUserEvent(ID_USER_CONFIRM_GEOLOCATION_CLOSE, null);
 			break;
 		}
 		case USER_CONFIRM_NOTIFICATION:
 		{
-			GetOwner()->SendUserEvent(ID_USER_CONFIRM_NOTIFICATION_CLOSE, null);
+			__pImpl->SendUserEvent(ID_USER_CONFIRM_NOTIFICATION_CLOSE, null);
 			break;
 		}
 		case USER_SCRIPT_ALERT:
 		{
-			GetOwner()->SendUserEvent(ID_USER_SCRIPT_ALERT_CLOSE, null);
+			__pImpl->SendUserEvent(ID_USER_SCRIPT_ALERT_CLOSE, null);
+			break;
+		}
+		case USER_SCRIPT_CONFIRM:
+		{
+			__pImpl->SendUserEvent(ID_USER_SCRIPT_CONFIRM_CLOSE, null);
 			break;
 		}
 		default:
@@ -372,6 +383,12 @@ CATCH:
 		ewk_view_javascript_alert_reply(pView);
 		break;
 	}
+	case USER_SCRIPT_CONFIRM:
+	{
+		Evas_Object* pView = reinterpret_cast< Evas_Object* >(__pUserPolicyData);
+		ewk_view_javascript_confirm_reply(pView, allow);
+		break;
+	}
 	case USER_CONFIRM_APP_CACHE:
 	{
 		Evas_Object *pObj = reinterpret_cast< Evas_Object* >(__pUserPolicyData);
@@ -500,7 +517,7 @@ _UserConfirmPopup::RegisterHandler(bool checkHandler, Eina_Bool allow)
 bool
 _UserConfirmPopup::OnKeyPressed(Control& source, const KeyEventInfo& keyEventInfo)
 {
-	return true;
+	return false;
 }
 
 bool
@@ -521,22 +538,27 @@ _UserConfirmPopup::OnKeyReleased(Control& source, const KeyEventInfo& keyEventIn
 		{
 		case USER_CONFIRM_USERMEDIA:
 		{
-			GetOwner()->SendUserEvent(ID_USER_CONFIRM_USERMEDIA_CLOSE, null);
+			__pImpl->SendUserEvent(ID_USER_CONFIRM_USERMEDIA_CLOSE, null);
 			break;
 		}
 		case USER_CONFIRM_GEOLOCATION:
 		{
-			GetOwner()->SendUserEvent(ID_USER_CONFIRM_GEOLOCATION_CLOSE, null);
+			__pImpl->SendUserEvent(ID_USER_CONFIRM_GEOLOCATION_CLOSE, null);
 			break;
 		}
 		case USER_CONFIRM_NOTIFICATION:
 		{
-			GetOwner()->SendUserEvent(ID_USER_CONFIRM_NOTIFICATION_CLOSE, null);
+			__pImpl->SendUserEvent(ID_USER_CONFIRM_NOTIFICATION_CLOSE, null);
 			break;
 		}
 		case USER_SCRIPT_ALERT:
 		{
-			GetOwner()->SendUserEvent(ID_USER_SCRIPT_ALERT_CLOSE, null);
+			__pImpl->SendUserEvent(ID_USER_SCRIPT_ALERT_CLOSE, null);
+			break;
+		}
+		case USER_SCRIPT_CONFIRM:
+		{
+			__pImpl->SendUserEvent(ID_USER_SCRIPT_CONFIRM_CLOSE, null);
 			break;
 		}
 		case USER_PROTOCOL_HANDLER:
@@ -550,7 +572,7 @@ _UserConfirmPopup::OnKeyReleased(Control& source, const KeyEventInfo& keyEventIn
 			SysAssert(false);
 		}
 	}
-	return true;
+	return false;
 }
 
 bool
diff --git a/src/controls/FWebCtrl_Web.cpp b/src/controls/FWebCtrl_Web.cpp
index 74782d2..09b71aa 100755
--- a/src/controls/FWebCtrl_Web.cpp
+++ b/src/controls/FWebCtrl_Web.cpp
@@ -42,6 +42,7 @@
 #include <FUi_CoordinateSystemUtils.h>
 #include <FUi_AccessibilityContainer.h>
 #include <FUi_AccessibilityElement.h>
+#include <FUi_UiEventManager.h>
 #include <FUi_IAccessibilityFocusHandler.h>
 #include <FUi_IAccessibilityListener.h>
 #include <FUi_Math.h>
@@ -342,6 +343,7 @@ _Web::_Web(void)
 	, __edgeType(WEB_EDGE_NONE)
 	, __pTextElement(null)
 	, __previousTouchedPosition(0.0f, 0.0f)
+	, __isFullScreenEntered(false)
 {
 	SetBackgroundColor(Color(0, 0, 0, 0));
 }
@@ -349,6 +351,11 @@ _Web::_Web(void)
 
 _Web::~_Web(void)
 {
+	_UiEventManager* pManager = _UiEventManager::GetInstance();
+	SysAssertf(pManager, "Failed to get ui evnet manager.");
+
+	pManager->RemoveKeyEventListener(*this);
+
 	RemoveGestureListener();
 }
 
@@ -374,6 +381,11 @@ _Web::CreateWebN(void)
 	r = pWeb->InitializeGestureStates();
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
 
+	_UiEventManager* pManager = _UiEventManager::GetInstance();
+	SysAssertf(pManager, "Failed to get ui evnet manager.");
+
+	pManager->AddKeyEventListener(*pWeb.get());
+
 	return pWeb.release();
 }
 
@@ -694,6 +706,8 @@ _Web::SetEdgeReachedEvent(_WebEdgeType type)
 bool
 _Web::OnTouchPressed(const _Control& source, const _TouchInfo& touchInfo)
 {
+	evas_object_focus_set(GetWebNativeNode(), EINA_TRUE);
+
 	if (__pEflWebkit.get())
 	{
 		__edgeType = WEB_EDGE_NONE;
@@ -1142,4 +1156,30 @@ _Web::GetEvasTouchState(TouchStatus touchStatus)
 }
 
 
+void
+_Web::SetFullScreenEntered(bool isFullScreenEntered)
+{
+	__isFullScreenEntered = isFullScreenEntered;
+}
+
+
+bool
+_Web::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
+{
+	if (__isFullScreenEntered)
+	{
+		if (keyInfo.GetKeyCode() == _KEY_ESC || keyInfo.GetKeyCode() == _KEY_BACK)
+		{
+			__isFullScreenEntered = false;
+
+			ewk_view_fullscreen_exit(GetWebNativeNode());
+
+			return true;
+		}
+	}
+
+	return false;
+}
+
+
 }}} // Tizen::Web::Controls
diff --git a/src/controls/FWebCtrl_Web.h b/src/controls/FWebCtrl_Web.h
index a1878ae..44fab11 100755
--- a/src/controls/FWebCtrl_Web.h
+++ b/src/controls/FWebCtrl_Web.h
@@ -115,6 +115,8 @@ public:
 
 	void SetEdgeReachedEvent(_WebEdgeType type);
 
+	void SetFullScreenEntered(bool isFullScreenEntered);
+
 	virtual result OnAttaching(const _Control* pParent);
 	virtual result OnBoundsChanging(const Tizen::Graphics::Rectangle& bounds);
 
@@ -147,6 +149,8 @@ public:
 	virtual bool OnCaptureAcquire(Tizen::Graphics::BufferInfo& output);
 	virtual void OnCaptureReleased(void) {};
 
+	virtual bool OnKeyReleased(const Tizen::Ui::_Control& source, const Tizen::Ui::_KeyInfo& keyInfo);
+
 private:
 	_Web(const _Web& value);
 
@@ -196,6 +200,8 @@ private:
 	Tizen::Ui::_AccessibilityElement* __pTextElement;
 
 	Tizen::Graphics::FloatPoint __previousTouchedPosition;
+
+	bool __isFullScreenEntered;
 }; // _Web
 
 }}} // Tizen::Web::Controls
diff --git a/src/controls/FWebCtrl_WebImpl.cpp b/src/controls/FWebCtrl_WebImpl.cpp
index 49e19bd..525baeb 100755
--- a/src/controls/FWebCtrl_WebImpl.cpp
+++ b/src/controls/FWebCtrl_WebImpl.cpp
@@ -87,7 +87,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"
@@ -365,24 +365,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;
-
-	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;
 }
 
@@ -417,6 +405,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:
@@ -459,6 +449,8 @@ 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());
 		}
 
 		if (pImpl)
@@ -483,6 +475,8 @@ CATCH:
 	ewk_certificate_policy_decision_allowed_set(pPolicy, EINA_FALSE);
 	pImpl->SetCertificateConfirmed(false);
 	pImpl->SetCertificateRequested(true);
+
+	ewk_view_resume(pWebCore->GetWebNativeNode());
 }
 
 
@@ -838,9 +832,16 @@ 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");
 
-	SysLog(NID_WEB_CTRL, "Enter.");
+	_Web* pWebCore = dynamic_cast< _Web* >(&(pImpl->GetCore()));
+	SysAssertf(pWebCore, "Failed to get Web core object");
+
+	if (pIsHandleNeeded && *pIsHandleNeeded)
+	{
+		pWebCore->SetFullScreenEntered(true);
+	}
 }
 
 
@@ -850,7 +851,10 @@ OnFullScreenExited(void* pUserData, Evas_Object* pView, void* pEventInfo)
 	_WebImpl* pImpl = reinterpret_cast<_WebImpl*>(pUserData);
 	SysAssertf(pImpl, "Failed to request");
 
-	SysLog(NID_WEB_CTRL, "Exit.");
+	_Web* pWebCore = dynamic_cast< _Web* >(&(pImpl->GetCore()));
+	SysAssertf(pWebCore, "Failed to get Web core object");
+
+	pWebCore->SetFullScreenEntered(false);
 }
 
 
@@ -896,6 +900,11 @@ OnLoadingRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
 	if (pImpl->GetLoadingListener() && 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())
@@ -978,8 +987,7 @@ OnLoadingRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
 		else
 		{
 			String operationId(L"http://tizen.org/appcontrol/operation/view");
-			String mime(ewk_policy_decision_response_mime_get(pPolicy));
-			r = _AppControlImpl::FindAndStart(operationId, &url, &mime, null, null, null);
+			r = _AppControlImpl::FindAndStart(operationId, &url, null, null, null, null);
 		}
 		SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -1130,8 +1138,6 @@ OnWebDataReceived(void* pUserData, Evas_Object* pView, void* pEventInfo)
 		{
 			ewk_policy_decision_ignore(pPolicy);
 
-			_SelectBox selectBox;
-			int selectedIndex = 0;
 			String operationId(L"http://tizen.org/appcontrol/operation/view");
 
 			r = _AppControlImpl::FindAndStart(operationId, &url, &mime, null, null, null);
@@ -1139,24 +1145,15 @@ OnWebDataReceived(void* pUserData, Evas_Object* pView, void* pEventInfo)
 	
 			if (r == E_OBJ_NOT_FOUND)
 			{
-				r = selectBox.Construct(false, L"Select application", 1); //+1 for Downloader
-				SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
+				_SelectBox* pSelectBox = new (std::nothrow) _SelectBox;
+				SysTryReturnVoidResult(NID_WEB_CTRL, pSelectBox, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
-				selectBox.AddListItem(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_DOWNLOAD"), _SelectBox::LIST_ITEM_TYPE_NORMAL, false);
-				r = selectBox.ShowAndWait(selectedIndex);
+				r = pSelectBox->Construct(false, L"Select application", 1, null, url);
 				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));
-				}
+				pSelectBox->AddListItem(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_DOWNLOAD_ABB"), _SelectBox::LIST_ITEM_TYPE_NORMAL, false);
+				r = pSelectBox->ShowPopup();
+				SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 			}
 
 			return;
@@ -1586,97 +1583,6 @@ OnWebPageBlockSelected(void* pUserData, Evas_Object* pView, void* pEventInfo)
 }
 
 
-Eina_Bool
-OnSelectUploadFile(Evas_Object* pView, Eina_Bool multipleFile, Eina_List* pAcceptTypes, const char* pCapture, void* pUserData)
-{
-	std::unique_ptr<_MediaSelectionListener> pMediaListener(new (std::nothrow) _MediaSelectionListener());
-	SysTryReturn(NID_WEB_CTRL, pMediaListener.get(), EINA_TRUE, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
-
-	pMediaListener->Construct(pView);
-
-	HashMap extraData;
-	result r = extraData.Construct();
-	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, EINA_TRUE, r, "[%s] Propagating.", GetErrorMessage(r));
-
-	String isMultipleSelection(L"single");
-	String mode(L"selectionType");
-	String type(L"type");
-	String fileType = L"*/*";
-	String operationId = L"http://tizen.org/appcontrol/operation/pick";
-
-	if (multipleFile)
-	{
-		isMultipleSelection.Append(L"multiple");
-	}
-
-	if (eina_list_count(pAcceptTypes) == 1)
-	{
-		String item((char*)eina_list_nth(pAcceptTypes, 0));
-		String captureString(pCapture);
-
-		if (item.StartsWith("image/",0))
-		{
-			if (captureString == L"camera")
-			{
-				fileType = L"image/jpg";
-				operationId = L"http://tizen.org/appcontrol/operation/create_content";
-				String typeKey = L"http://tizen.org/appcontrol/data/camera/allow_switch";
-				String typeVal = L"false";
-				extraData.Add(&typeKey, &typeVal);
-			}
-			else
-			{
-				fileType = L"image/*";
-				String selectKey = L"http://tizen.org/appcontrol/data/selection_mode";
-				extraData.Add(&selectKey, &isMultipleSelection);
-			}
-		}
-		else if (item.StartsWith("audio/",0))
-		{
-			fileType = L"audio/*";
-			//TO DO: as microphone is not supported yet. suggest to throw an exception
-			//if (captureString == L"microphone")
-			//{
-				//operationId = L"http://tizen.org/appcontrol/operation/create_content";
-			//}
-			//else
-			//{
-				String selectKey = L"http://tizen.org/appcontrol/data/selection_mode";
-				extraData.Add(&selectKey, &isMultipleSelection);
-			//}
-		}
-		else if (item.StartsWith("video/",0))
-		{
-			if (captureString == L"camcorder")
-			{
-				fileType = L"video/3gpp";
-				operationId = L"http://tizen.org/appcontrol/operation/create_content";
-				String typeKey = L"http://tizen.org/appcontrol/data/camera/allow_switch";
-				String typeVal = L"false";
-				extraData.Add(&typeKey, &typeVal);
-			}
-			else
-			{
-				fileType = L"video/*";
-				String selectKey = L"http://tizen.org/appcontrol/data/selection_mode";
-				extraData.Add(&selectKey, &isMultipleSelection);
-			}
-		}
-	}
-
-	r = _AppControlImpl::FindAndStart(operationId, null, &fileType, null, &extraData, pMediaListener.get());
-	SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
-
-	pMediaListener.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)
 {
@@ -1724,15 +1630,15 @@ 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)
 		{
-			pFormCore->DeflateClientRectHeight(pXformer->TransformVertical(rect.height));
+			pFormImpl->DeflateClientRectHeight(pXformer->TransformVertical(rect.height));
 
-			if (pFormCore->HasFooter())
+			if (pFormImpl->HasFooter())
 			{
-				pFormCore->SetKeypadShowState(true);
-				pFormCore->Draw();
+				pFormImpl->GetCore().SetKeypadShowState(true);
+				pFormImpl->Draw();
 			}			
 		}
 
@@ -1780,15 +1686,15 @@ 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)
 	{
-		pFormCore->DeflateClientRectHeight(0);
+		pFormImpl->DeflateClientRectHeight(0);
 
-		if (pFormCore->HasFooter())
+		if (pFormImpl->HasFooter())
 		{
-			pFormCore->SetKeypadShowState(false);
-			pFormCore->Draw();
+			pFormImpl->GetCore().SetKeypadShowState(false);
+			pFormImpl->Draw();
 		}
 	}
 
@@ -1827,7 +1733,7 @@ OnWebNativeNodeFocusGained(void* pUserData, Evas* pCanvas, Evas_Object* pView, v
 
 	if (pImpl->IsKeypadOpened() == true)
 	{
-		pImpl->SetKeypadOpened(false);	
+		pImpl->SetKeypadOpened(false);
 	}
 } 
 
@@ -2204,6 +2110,7 @@ _WebImpl::_WebImpl(Web* pWeb, Tizen::Ui::_Control* pCore)
 	, __pGeolocationConfirmPopup(null)
 	, __pNotificationConfirmPopup(null)
 	, __pScriptAlertConfirmPopup(null)
+	, __pScriptConfirmPopup(null)
 	, __pAppCacheConfirmPopup(null)
 	, __pDbQuotaConfirmPopup(null)
 	, __pLocalFsQuotaConfirmPopup(null)
@@ -2218,6 +2125,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;
@@ -2231,13 +2139,14 @@ _WebImpl::_WebImpl(Web* pWeb, Tizen::Ui::_Control* pCore)
 
 _WebImpl::~_WebImpl()
 {
-	_WebManager* pWebManager = _WebManager::GetInstance();
-	pWebManager->RemoveWeb(reinterpret_cast< int >(this));
-
 	_DownloadManagerImpl* pManagerImpl = _DownloadManagerImpl::GetInstance();
 	pManagerImpl->SetDownloadListener(null);
 
+	_WebManager* pWebManager = _WebManager::GetInstance();
+	pWebManager->RemoveWeb(reinterpret_cast< int >(this));
+
 	RemoveEventListenerCallback();
+
 	ClearCertificateDb();
 }
 
@@ -2332,9 +2241,6 @@ _WebImpl::Construct(void)
 	__pWebCore = dynamic_cast< _Web* >(&(GetCore()));
 	SysTryReturnResult(NID_WEB_CTRL, __pWebCore, E_SYSTEM, "A system error has been occurred. Failed to get web control");
 
-	_WebManager* pWebManager = _WebManager::GetInstance();
-	pWebManager->AddWeb(reinterpret_cast< int >(this));
-
 	return E_SUCCESS;
 }
 
@@ -2547,6 +2453,8 @@ _WebImpl::ClearSelectBoxPopup(void)
 
 	__pSelectBox.reset();
 
+	Resume();
+
 	return E_SUCCESS;
 }
 
@@ -2648,12 +2556,12 @@ _WebImpl::EvaluateJavascriptN(const String& scriptCode)
 
 	ewk_view_script_execute(pView, pScript.get(), OnScriptExecuted, pPresenter.get());
 
-	std::unique_ptr<String> pResult(new (std::nothrow) String(L""));
-	SysTryReturn(NID_WEB_CTRL, pResult.get(), null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
+	String* pResult = new (std::nothrow) String(L"");
+	SysTryReturn(NID_WEB_CTRL, pResult, null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
-	pPresenter->WaitAsyncProcess(*pResult.get());
+	pPresenter->WaitAsyncProcess(*pResult);
 
-	return pResult.release();
+	return pResult;
 }
 
 
@@ -2853,6 +2761,10 @@ _WebImpl::SynchronizeSearch(_SearchType type, Evas_Object* pView, Ewk_Find_Optio
 	std::unique_ptr<char[]> pText(_StringConverter::CopyToCharArrayN(text));
 	SysTryReturn(NID_WEB_CTRL, pText.get(), GetLastResult(), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
+	Ewk_Settings* pSettings = ewk_view_settings_get(__pWebCore->GetWebNativeNode());
+	SysAssertf(pSettings, "Failed to get webkit instance.");
+	ewk_settings_clear_text_selection_automatically_set(pSettings, true);
+
 	switch (type)
 	{
 	case SEARCH_SYNC:
@@ -3633,7 +3545,6 @@ _WebImpl::SetEventListenerCallback(void) const
 		evas_object_smart_callback_add(pWebNativeNode, "fullscreen,enterfullscreen", OnFullScreenEntered, this);
 		evas_object_smart_callback_add(pWebNativeNode, "fullscreen,exitfullscreen", OnFullScreenExited, 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));
@@ -3686,9 +3597,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);
 
@@ -3717,7 +3628,6 @@ _WebImpl::RemoveEventListenerCallback(void) const
 		evas_object_smart_callback_del(pWebNativeNode, "fullscreen,enterfullscreen", OnFullScreenEntered);
 		evas_object_smart_callback_del(pWebNativeNode, "fullscreen,exitfullscreen", OnFullScreenExited);
 
-		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);
@@ -3774,6 +3684,10 @@ _WebImpl::SetBlockSelectionPosition(const FloatPoint& startPoint)
 	{
 		Point absPoint( _CoordinateSystemUtils::ConvertToInteger(__pWebCore->GetAbsoluteCoordinate(startPoint)));
 
+		Ewk_Settings* pSettings = ewk_view_settings_get(__pWebCore->GetWebNativeNode());
+		SysAssertf(pSettings, "Failed to get webkit instance.");
+		ewk_settings_clear_text_selection_automatically_set(pSettings, true);
+
 		Eina_Bool ret = pSmartData->api->text_selection_down(pSmartData, absPoint.x, absPoint.y);
 		if (ret)
 		{
@@ -4626,7 +4540,7 @@ _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));
 
 	int modalResult = 0;
@@ -4635,62 +4549,80 @@ _WebImpl::ShowUserConfirmPopup(_UserConfirmMode userConfirmMode, void* pPolicy,
 	{
 	case USER_CONTENT_HANDLER:
 	{
-		__pContentHandlerConfirmPopup.reset();
-
 		__pContentHandlerConfirmPopup = std::move(pUserConfirmPopup);
 
 		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.reset();
-
 		__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.reset();
-
 		__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.reset();
-
 		__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.reset();
-
 		__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.reset();
-
 		__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:
@@ -4709,13 +4641,13 @@ _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));
 
 	switch(userConfirmMode)
 	{
 	case USER_CONFIRM_USERMEDIA:
-    {
+	{
         __pUserMediaConfirmPopup.reset();
 
 		__pUserMediaConfirmPopup = std::move(pUserConfirmPopup);
@@ -4762,6 +4694,19 @@ _WebImpl::ShowUserConfirmPopupAsync(_UserConfirmMode userConfirmMode, void* pPol
 		__pScriptAlertConfirmPopup.release();
 		break;
 	}
+	case USER_SCRIPT_CONFIRM:
+	{
+		__pScriptConfirmPopup.reset();
+
+		__pScriptConfirmPopup = std::move(pUserConfirmPopup);
+
+		r = __pScriptConfirmPopup->ShowPopup();
+		SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, __pScriptConfirmPopup.reset(), r, "[%s] Propagating.", GetErrorMessage(r));
+
+		__pScriptConfirmPopup.release();
+
+		break;
+	}
 	default:
 		break;
 	}
@@ -4773,31 +4718,35 @@ CATCH:
 }
 
 
-_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);
 }
 
 
 bool 
 _WebImpl::OnFocusGained(const _ControlImpl& source)
 {
+	Ewk_Settings* pSettings = ewk_view_settings_get(__pWebCore->GetWebNativeNode());
+	SysAssertf(pSettings, "Failed to get webkit instance.");
+	ewk_settings_clear_text_selection_automatically_set(pSettings, true);
+
 	return false;
 }
 
@@ -4812,6 +4761,10 @@ _WebImpl::OnFocusLost(const _ControlImpl& source)
 		SetKeypadVisibleState(false);
 	}
 
+	Ewk_Settings* pSettings = ewk_view_settings_get(__pWebCore->GetWebNativeNode());
+	SysAssertf(pSettings, "Failed to get webkit instance.");
+	ewk_settings_clear_text_selection_automatically_set(pSettings, false);
+
 	evas_object_focus_set(__pWebCore->GetWebNativeNode(), EINA_FALSE);
 
 	return false;
@@ -4835,13 +4788,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;
@@ -4900,12 +4884,15 @@ _WebImpl::OnChangeLayout(_ControlOrientation orientation)
 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);
 	}
 }
@@ -4936,9 +4923,14 @@ _WebImpl::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::ILi
 	case ID_USER_SCRIPT_ALERT_CLOSE:
 		__pScriptAlertConfirmPopup.reset();
 		break;
+	case ID_USER_SCRIPT_CONFIRM_CLOSE:
+		__pScriptConfirmPopup.reset();
+		break;
 	default:
 		break;
 	}
+
+	Resume();
 }
 
 
@@ -4954,6 +4946,8 @@ _WebImpl::HideColorPicker(void)
 {
 	__pColorPicker.reset();
 
+	Resume();
+
 	return EINA_TRUE;
 }
 
@@ -4985,6 +4979,7 @@ CATCH:
 	if (__pColorPicker)
 	{
 		__pColorPicker.reset();
+		Resume();
 	}
 
 	return r;
@@ -5016,6 +5011,7 @@ CATCH:
 	if (__pDatePicker)
 	{
 		__pDatePicker.reset();
+		Resume();
 	}
 
 	return r;
diff --git a/src/controls/FWebCtrl_WebManager.cpp b/src/controls/FWebCtrl_WebManager.cpp
index 364ede6..d62b8c7 100755
--- a/src/controls/FWebCtrl_WebManager.cpp
+++ b/src/controls/FWebCtrl_WebManager.cpp
@@ -23,11 +23,16 @@
  */
 
 #include <FBaseSysLog.h>
+#include <FUiControl.h>
+#include <FUiCtrl_FormImpl.h>
 #include "FWebCtrl_WebImpl.h"
 #include "FWebCtrl_WebManager.h"
+#include "FWebCtrl_WebPopup.h"
 
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
+using namespace Tizen::Ui;
+using namespace Tizen::Ui::Controls;
 
 namespace Tizen { namespace Web { namespace Controls
 {
@@ -35,6 +40,8 @@ namespace Tizen { namespace Web { namespace Controls
 _WebManager::_WebManager(void)
 	: __pWebList(null)
 	, __pCallbackList(null)
+	, __pActiveWeb(null)
+	, __pActivePopup(null)
 {
 }
 
@@ -152,4 +159,64 @@ _WebManager::IsValidCallback(int callerAdress, int callbackAdress) const
 	return ret;
 }
 
+void
+_WebManager::SetActiveWeb(Tizen::Web::Controls::_WebImpl* pWebAddress)
+{
+	if (__pActiveWeb == null)
+	{
+		__pActiveWeb = pWebAddress;
+	}
+	else
+	{
+		if (__pActiveWeb->IsVisible() == true)
+		{
+			return;
+		}
+		__pActiveWeb = pWebAddress;
+	}
+
+	if (__pActivePopup != null)
+	{
+		__pActivePopup->SetShowState(false);
+
+		_FormImpl* pFormImpl = __pActiveWeb->GetParentFormImpl(__pActiveWeb);
+
+		if (pFormImpl != null)
+		{
+			__pActivePopup->SetOwner(&pFormImpl->GetPublic());
+		}
+		else
+		{
+			__pActivePopup->SetOwner(&__pActiveWeb->GetPublic());
+		}
+
+		__pActivePopup->SetShowState(true);
+		__pActivePopup->Show();
+	}
+}
+
+void
+_WebManager::RemoveActiveWeb(Tizen::Web::Controls::_WebImpl* pWebAddress)
+{
+	if (__pActiveWeb == pWebAddress)
+	{
+		__pActiveWeb = null;
+	}
+}
+
+void
+_WebManager::SetActivePopup(Tizen::Web::Controls::_WebPopup* pPopupAddress)
+{
+	__pActivePopup = pPopupAddress;
+}
+
+void
+_WebManager::RemoveActivePopup(Tizen::Web::Controls::_WebPopup* pPopupAddress)
+{
+	if (__pActivePopup == pPopupAddress)
+	{
+		__pActivePopup = null;
+	}
+}
+
 } } }
diff --git a/src/controls/FWebCtrl_WebManager.h b/src/controls/FWebCtrl_WebManager.h
index ed0adca..3519729 100755
--- a/src/controls/FWebCtrl_WebManager.h
+++ b/src/controls/FWebCtrl_WebManager.h
@@ -31,6 +31,7 @@
 namespace Tizen { namespace Web { namespace Controls
 {
 class _WebImpl;
+class _WebPopup;
 
 class _WebManager
 	: public Tizen::Base::Object
@@ -46,6 +47,11 @@ public:
 	result RemoveCallback(int callerAdress, int callbackAdress);
 	bool IsValidCallback(int callerAdress, int callbackAdress) const;
 
+	void SetActiveWeb(Tizen::Web::Controls::_WebImpl* pWebAddress);
+	void RemoveActiveWeb(Tizen::Web::Controls::_WebImpl* pWebAddress);
+	void SetActivePopup(Tizen::Web::Controls::_WebPopup* pPopupAddress);
+	void RemoveActivePopup(Tizen::Web::Controls::_WebPopup* pPopupAddress);
+
 private:
 	_WebManager(void);
 	_WebManager(const _WebManager& rhs);
@@ -56,9 +62,12 @@ private:
 private:
 	std::unique_ptr<Tizen::Base::Collection::ArrayListT< int > > __pWebList;
 	std::unique_ptr<Tizen::Base::Collection::MultiHashMapT< int, int > > __pCallbackList;
+
+	_WebImpl* __pActiveWeb;
+	_WebPopup* __pActivePopup;
 };
 
 } } }
 #endif
 
- 
\ No newline at end of file
+ 
diff --git a/src/controls/FWebCtrl_WebPopup.cpp b/src/controls/FWebCtrl_WebPopup.cpp
old mode 100644
new mode 100755
index 1c35aab..e1ca104
--- a/src/controls/FWebCtrl_WebPopup.cpp
+++ b/src/controls/FWebCtrl_WebPopup.cpp
@@ -25,6 +25,7 @@
 #include <FUiCtrlPanel.h>
 #include <FUiVerticalBoxLayout.h>
 #include <FUi_ResourceManager.h>
+#include "FWebCtrl_WebManager.h"
 #include "FWebCtrl_WebPopup.h"
 
 
@@ -50,11 +51,10 @@ _WebPopup::_WebPopup(void)
 
 _WebPopup::~_WebPopup(void)
 {
-	if (IsModalPopup() == true)
+	if (IsModalPopup())
 	{
-		HidePopup(0);
+		HidePopup();
 	}
-
 	__pWebPopupData.reset();
 }
 
@@ -104,6 +104,9 @@ _WebPopup::ShowPopup(void)
 {
 	result r = E_SUCCESS;
 
+	_WebManager* pWebManager = _WebManager::GetInstance();
+	pWebManager->SetActivePopup(this);
+
 	r = SetShowState(true);
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -122,6 +125,9 @@ _WebPopup::HidePopup(int modalResult)
 	r = SetShowState(false);
 	SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
+	_WebManager* pWebManager = _WebManager::GetInstance();
+	pWebManager->RemoveActivePopup(this);
+
 	if (__isModal)
 	{
 		__modal = modalResult;
@@ -137,6 +143,9 @@ _WebPopup::HidePopup(int modalResult)
 result
 _WebPopup::ShowAndWait(int& modalResult)
 {
+	_WebManager* pWebManager = _WebManager::GetInstance();
+	pWebManager->SetActivePopup(this);
+
 	__isModal = true;
 
 	return DoModal(modalResult);
@@ -247,4 +256,11 @@ _WebPopup::GetPopupData(bool refresh)
 }
 
 
+result
+_WebPopup::OnTerminating(void)
+{
+	return E_SUCCESS;
+}
+
+
 }}} // Tizen::Web::Controls
diff --git a/src/controls/inc/FWebCtrl_CertificateConfirmPopup.h b/src/controls/inc/FWebCtrl_CertificateConfirmPopup.h
index f9b3c0d..4c1260a 100755
--- a/src/controls/inc/FWebCtrl_CertificateConfirmPopup.h
+++ b/src/controls/inc/FWebCtrl_CertificateConfirmPopup.h
@@ -25,6 +25,7 @@
 
 #include <EWebKit2.h>
 #include <unique_ptr.h>
+#include <FBaseColIList.h>
 #include <FBaseString.h>
 #include <FUiIPropagatedKeyEventListener.h>
 #include "FWebCtrl_WebPopup.h"
@@ -32,6 +33,7 @@
 
 namespace Tizen { namespace Web { namespace Controls
 {
+class _WebImpl;
 
 enum _IdButtonCertificatePopup
 {
@@ -63,7 +65,7 @@ public:
 	 */
 	virtual ~_CertificateConfirmPopup(void);
 
-	result Construct(_CertificatePopupMode certPopupMode, Ewk_Certificate_Policy_Decision* pPolicy);
+	result Construct(_CertificatePopupMode certPopupMode, Ewk_Certificate_Policy_Decision* pPolicy, Tizen::Web::Controls::_CertificateConfirmPopup* pParent = null);
 
 	void HandleUserAction(bool allow);
 
@@ -90,11 +92,15 @@ private:
 
 	Tizen::Base::String GetStringOfToken(const Tizen::Base::String& parseString, const Tizen::Base::String& parseToken);
 
+	virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
+
 private:
 	_CertificatePopupMode __certPopupMode;
 	bool __confirm;
 
 	Ewk_Certificate_Policy_Decision* __pCertificatePolicyData;
+	_CertificateConfirmPopup* __pParent;
+	std::unique_ptr<_CertificateConfirmPopup> __pCertificatePopup;
 }; // _CertificateConfirmPopup
 
 }}} // Tizen::Web::Controls
diff --git a/src/controls/inc/FWebCtrl_UserConfirmPopup.h b/src/controls/inc/FWebCtrl_UserConfirmPopup.h
index a693806..0cbdfbe 100755
--- a/src/controls/inc/FWebCtrl_UserConfirmPopup.h
+++ b/src/controls/inc/FWebCtrl_UserConfirmPopup.h
@@ -35,6 +35,7 @@ class CheckButton;
 
 namespace Tizen { namespace Web { namespace Controls
 {
+class _WebImpl;
 
 enum _UserConfirmPopupButtonId
 {
@@ -51,6 +52,7 @@ enum _UserConfirmMode
 	USER_CONFIRM_GEOLOCATION,
 	USER_CONFIRM_NOTIFICATION,
 	USER_SCRIPT_ALERT,
+	USER_SCRIPT_CONFIRM,
 	USER_CONFIRM_APP_CACHE,
 	USER_CONFIRM_DB_QUOTA_EXCEDED,
 	USER_CONFIRM_LOCAL_FS_QUOTA_EXCEDED,
@@ -73,7 +75,7 @@ public:
 	 */
 	virtual ~_UserConfirmPopup(void);
 
-	result Construct(_UserConfirmMode userConfirmMode, void* pEventInfo, bool sync = false, Tizen::Base::String msg = L"");
+	result Construct(_UserConfirmMode userConfirmMode, void* pEventInfo, Tizen::Web::Controls::_WebImpl* pImpl, bool sync = false, Tizen::Base::String msg = L"");
 
 	virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
@@ -101,6 +103,7 @@ private:
 	Tizen::Ui::Controls::CheckButton* __pCheckButton;
 
 	bool __sync;
+	Tizen::Web::Controls::_WebImpl* __pImpl;
 }; // _UserConfirmPopup
 
 }}} // Tizen::Web::Controls
diff --git a/src/controls/inc/FWebCtrl_WebImpl.h b/src/controls/inc/FWebCtrl_WebImpl.h
index 316bda2..267719f 100755
--- a/src/controls/inc/FWebCtrl_WebImpl.h
+++ b/src/controls/inc/FWebCtrl_WebImpl.h
@@ -66,15 +66,15 @@ class _VibratorImpl;
 
 namespace Tizen { namespace Ui
 {
-class Contorl;
-class _Contorl;
-class _ContorlImpl;
+class Control;
+class _Control;
+class _ControlImpl;
 }} // Tizen::Ui
 
 namespace Tizen { namespace Ui {  namespace Controls
 {
 class Keypad;
-class _Form;
+class _FormImpl;
 }}} // Tizen::Ui::Controls
 
 namespace Tizen { namespace Web { namespace Json
@@ -136,7 +136,8 @@ enum _WebPopupCloseId
 	ID_USER_CONFIRM_USERMEDIA_CLOSE,
 	ID_USER_CONFIRM_GEOLOCATION_CLOSE,
 	ID_USER_CONFIRM_NOTIFICATION_CLOSE,
-	ID_USER_SCRIPT_ALERT_CLOSE
+	ID_USER_SCRIPT_ALERT_CLOSE,
+	ID_USER_SCRIPT_CONFIRM_CLOSE
 };
 
 class _OSP_EXPORT_ _WebImpl
@@ -360,7 +361,7 @@ public:
 	result ShowUserConfirmPopup(_UserConfirmMode userConfirmMode, void* pPolicy, Tizen::Base::String msg = L"");
 	result ShowUserConfirmPopupAsync(_UserConfirmMode userConfirmMode, void* pPolicy, Tizen::Base::String msg = L"");
 
-	Tizen::Ui::Controls::_Form* GetParentFormCore(Tizen::Ui::_Control* pControlCore);
+	Tizen::Ui::Controls::_FormImpl* GetParentFormImpl(Tizen::Ui::_ControlImpl* pControlImpl);
 
 	result ShowSelectBoxPopup(bool isMultiSelect, const Tizen::Base::String& title, Eina_List* pItems, Evas_Object* pWebView, int selectedIndex);
 	result UpdateSelectBoxPopup(Eina_List* pItems, int selectedIndex, bool isGroupedList);
@@ -388,6 +389,8 @@ public:
 
 	virtual result OnPreAttachedToMainTree(void);
 
+	virtual result OnDetachingFromMainTree(void);
+
 	virtual void OnChangeLayout(Tizen::Ui::_ControlRotation rotation);
 
 	virtual void OnChangeLayout(Tizen::Ui::_ControlOrientation orientation);
@@ -486,6 +489,7 @@ private:
 	std::unique_ptr<_UserConfirmPopup> __pGeolocationConfirmPopup;
 	std::unique_ptr<_UserConfirmPopup> __pNotificationConfirmPopup;
 	std::unique_ptr<_UserConfirmPopup> __pScriptAlertConfirmPopup;
+	std::unique_ptr<_UserConfirmPopup> __pScriptConfirmPopup;
 	std::unique_ptr<_UserConfirmPopup> __pAppCacheConfirmPopup;
 	std::unique_ptr<_UserConfirmPopup> __pDbQuotaConfirmPopup;
 	std::unique_ptr<_UserConfirmPopup> __pLocalFsQuotaConfirmPopup;
@@ -512,6 +516,8 @@ private:
 	Tizen::Base::String __defaultUserAgent;
 
 	Eina_List* __pFormDataList;
+
+	bool __popupClosed;
 }; // _WebImpl
 
 }}} // Tizen::Web::Controls
diff --git a/src/controls/inc/FWebCtrl_WebPopup.h b/src/controls/inc/FWebCtrl_WebPopup.h
index 752e345..52f3deb 100755
--- a/src/controls/inc/FWebCtrl_WebPopup.h
+++ b/src/controls/inc/FWebCtrl_WebPopup.h
@@ -122,6 +122,8 @@ private:
 
 	_WebPopup& operator =(const _WebPopup& source);
 
+	virtual result OnTerminating(void);
+
 private:
 	static std::unique_ptr<_WebPopupData> __pWebPopupData;
 	bool __isModal;
-- 
2.7.4