From bf476a039a8b8fd315829f8a21d4ad0dfbb8f803 Mon Sep 17 00:00:00 2001 From: Seongjun Yim Date: Sun, 29 Sep 2013 20:12:56 +0900 Subject: [PATCH] apply RemoveSettingListener() to avoid crash issue Change-Id: Iba8b9bc75ddcfacbe207880cdf537d47f66602b7 Signed-off-by: Seongjun Yim --- inc/FWebCtrlWebSetting.h | 2 +- src/controls/FWebCtrl_WebImpl.cpp | 2 +- src/controls/FWebCtrl_WebSettingImpl.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/FWebCtrlWebSetting.h b/inc/FWebCtrlWebSetting.h index b4e3528..e810f80 100755 --- a/inc/FWebCtrlWebSetting.h +++ b/inc/FWebCtrlWebSetting.h @@ -176,7 +176,7 @@ public: /** * Gets the font size of the content. @n - * The default size is @c 17. + * The default size is @c 16. * * @since 2.0 * diff --git a/src/controls/FWebCtrl_WebImpl.cpp b/src/controls/FWebCtrl_WebImpl.cpp index 09e2258..81e8a04 100755 --- a/src/controls/FWebCtrl_WebImpl.cpp +++ b/src/controls/FWebCtrl_WebImpl.cpp @@ -2231,8 +2231,8 @@ _WebImpl::~_WebImpl() pWebManager->RemoveActiveWeb(this); CATCH: + _SettingInfoImpl::RemoveSettingEventListener(*this); RemoveEventListenerCallback(); - ClearCertificateDb(); } diff --git a/src/controls/FWebCtrl_WebSettingImpl.cpp b/src/controls/FWebCtrl_WebSettingImpl.cpp index bd25d56..342feeb 100755 --- a/src/controls/FWebCtrl_WebSettingImpl.cpp +++ b/src/controls/FWebCtrl_WebSettingImpl.cpp @@ -39,9 +39,9 @@ namespace Tizen { namespace Web { namespace Controls static const wchar_t* DEFAULT_ENCODING_MODE = L"UTF-8"; -static const int DEFAULT_FONT_SIZE = 17; +static const int DEFAULT_FONT_SIZE = 16; static const float DEFAULT_ZOOM_LEVEL = 2.0f; -static const wchar_t* DEFAULT_USER_AGENT = L"Mozilla/5.0 (Linux; Tizen 2.1; sdk) AppleWebKit/537.3 (KHTML, like Gecko) Version/2.1 Mobile Safari/537.3"; +static const wchar_t* DEFAULT_USER_AGENT = L"Mozilla/5.0 (Linux; Tizen 2.2; sdk) AppleWebKit/537.3 (KHTML, like Gecko) Version/2.2 Mobile Safari/537.3"; _WebSettingImpl::_WebSettingImpl(void) -- 2.7.4