From: Seongjun Yim <se201.yim@samsung.com>
Date: Tue, 27 Aug 2013 07:55:43 +0000 (+0000)
Subject: Merge "fix certificatePopup" into tizen_2.2
X-Git-Tag: submit/tizen_2.2/20131107.062229~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a16dff3e58cc8119c05438dd2c64dddd577d473b;hp=bb996f62bf652bffc0ebb85efff7fbe6b7735a8c;p=framework%2Fosp%2Fweb.git

Merge "fix certificatePopup" into tizen_2.2
---

diff --git a/src/controls/FWebCtrl_CertificateConfirmPopup.cpp b/src/controls/FWebCtrl_CertificateConfirmPopup.cpp
index 00aecba..8e32321 100755
--- a/src/controls/FWebCtrl_CertificateConfirmPopup.cpp
+++ b/src/controls/FWebCtrl_CertificateConfirmPopup.cpp
@@ -68,6 +68,7 @@ _CertificateConfirmPopup::_CertificateConfirmPopup(void)
 						, __pCertificatePolicyData(null)
 						, __pParent(null)
 						, __pCertificatePopup(null)
+						, __reaction(false)
 {
 }
 
@@ -222,11 +223,24 @@ _CertificateConfirmPopup::OnActionPerformed(const Control& source, int actionId)
 	switch (actionId)
 	{
 	case ID_BUTTON_CERTIFICATE_ALLOW:
+	{
+		if (__reaction)
+		{
+			return;
+		}
+
 		HandleUserAction(true);
 		break;
+	}
 
 	case ID_BUTTON_CERTIFICATE_VIEW:
 	{
+		if (__reaction)
+		{
+			return;
+		}
+
+		__reaction = true;
 		std::unique_ptr<_CertificateConfirmPopup> pCertificatePopup(new (std::nothrow) _CertificateConfirmPopup());
 		SysTryReturnVoidResult(NID_WEB_CTRL, pCertificatePopup.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
 
@@ -241,11 +255,25 @@ _CertificateConfirmPopup::OnActionPerformed(const Control& source, int actionId)
 	}
 
 	case ID_BUTTON_CERTIFICATE_CANCEL:
+	{
+		if (__reaction)
+		{
+			return;
+		}
+
 		HandleUserAction(false);
 		break;
+	}
 
 	case ID_BUTTON_CERTIFICATE_CLOSE:
+	{
+		if (__reaction)
+		{
+			return;
+		}
+
 		break;
+	}
 
 	default:
 		SysAssert(false);
@@ -270,8 +298,16 @@ _CertificateConfirmPopup::OnUserEventReceivedN(RequestId requestId, IList* pArgs
 	switch (requestId)
 	{
 	case ID_CERTIFICATE_CONFIRM_POPUP_CLOSE:
+	{
 		__pCertificatePopup.reset();
+
+		if (__reaction)
+		{
+			__reaction = false;
+		}
+
 		break;
+	}
 	default:
 		break;
 	}
diff --git a/src/controls/inc/FWebCtrl_CertificateConfirmPopup.h b/src/controls/inc/FWebCtrl_CertificateConfirmPopup.h
index 4c1260a..abe701a 100755
--- a/src/controls/inc/FWebCtrl_CertificateConfirmPopup.h
+++ b/src/controls/inc/FWebCtrl_CertificateConfirmPopup.h
@@ -97,6 +97,7 @@ private:
 private:
 	_CertificatePopupMode __certPopupMode;
 	bool __confirm;
+	bool __reaction;
 
 	Ewk_Certificate_Policy_Decision* __pCertificatePolicyData;
 	_CertificateConfirmPopup* __pParent;