X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontrols%2Finc%2FFWebCtrl_WebImpl.h;h=267719f1b736a174bac11b31d01f411e51bfe8a3;hb=ff57de05fea9302935a08e4659f848fc4b75cf4a;hp=930ed7ea986a394e6fd8327f8b02e36bd9003767;hpb=d061e7c18c411f6cb6096b67c09a82d376124b76;p=framework%2Fosp%2Fweb.git

diff --git a/src/controls/inc/FWebCtrl_WebImpl.h b/src/controls/inc/FWebCtrl_WebImpl.h
index 930ed7e..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
@@ -347,7 +348,6 @@ public:
 
 	void SetKeypadOpened(bool isKeypadOpened);
 
-	bool IsPresenterAlived(_WebPresenter* pPresenter) const;
 	Tizen::Graphics::Rectangle GetPreviousKeypadBounds(void) const;
 
 	void SetPreviousKeypadBounds(Tizen::Graphics::Rectangle& bounds);
@@ -361,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);
@@ -389,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);
@@ -487,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;
@@ -506,8 +509,6 @@ private:
 
 	_TextSearch __textSearch;
 
-	Tizen::Base::Collection::ArrayList __callbackList;
-
 	Tizen::Base::Collection::ArrayList __webNotificationList;
 
 	DecisionPolicy __policy;
@@ -515,6 +516,8 @@ private:
 	Tizen::Base::String __defaultUserAgent;
 
 	Eina_List* __pFormDataList;
+
+	bool __popupClosed;
 }; // _WebImpl
 
 }}} // Tizen::Web::Controls