From bb1fc7679c9f710903f6d6363b75af2d073b5999 Mon Sep 17 00:00:00 2001 From: jyothi kumar sambolu Date: Wed, 3 Apr 2013 15:14:18 +0530 Subject: [PATCH] Fix for prevent issues Change-Id: I602f22bdbeb4e5ea26b61b3f9eb4fe4f1dc1362c Signed-off-by: jyothi kumar sambolu --- src/controls/FWebCtrlWebStorageManager.cpp | 5 ++-- src/controls/FWebCtrl_InputPickerPopup.cpp | 10 +++----- src/controls/FWebCtrl_UserConfirmPopup.cpp | 2 ++ src/controls/FWebCtrl_Utility.cpp | 2 ++ src/controls/FWebCtrl_Web.cpp | 23 ++++++++--------- src/controls/FWebCtrl_WebStorageManagerImpl.cpp | 33 +++++++++---------------- 6 files changed, 32 insertions(+), 43 deletions(-) diff --git a/src/controls/FWebCtrlWebStorageManager.cpp b/src/controls/FWebCtrlWebStorageManager.cpp index 210e67a..f0e31d8 100755 --- a/src/controls/FWebCtrlWebStorageManager.cpp +++ b/src/controls/FWebCtrlWebStorageManager.cpp @@ -55,6 +55,7 @@ WebStorageManager::WebStorageManager(void) WebStorageManager::~WebStorageManager(void) { + delete __pWebStorageManagerImpl; } @@ -103,7 +104,7 @@ WebStorageManager::GetOriginListN(WebStorageType storageType) const ClearLastResult(); result r = E_SUCCESS; - + r = _AccessController::CheckUserPrivilege(_PRV_WEB_PRIVACY); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, null, E_PRIVILEGE_DENIED, "[%s] The application does not have the privilege to call this method.", GetErrorMessage(E_PRIVILEGE_DENIED)); @@ -203,4 +204,4 @@ WebStorageManager::RemoveAll(WebStorageType storageType) } -}}} // Tizen::Web::Controls \ No newline at end of file +}}} // Tizen::Web::Controls diff --git a/src/controls/FWebCtrl_InputPickerPopup.cpp b/src/controls/FWebCtrl_InputPickerPopup.cpp index be05ff3..dd0d316 100755 --- a/src/controls/FWebCtrl_InputPickerPopup.cpp +++ b/src/controls/FWebCtrl_InputPickerPopup.cpp @@ -309,7 +309,7 @@ _InputPickerPopup::AddButton(_InputPickerButtonId buttonId) result r = E_SUCCESS; String buttonStr; - + _SystemResource* pSysResource = _SystemResource::GetInstance(); SysAssertf(pSysResource != null, "Failed to get _SystemResource instance"); @@ -640,15 +640,11 @@ _InputPickerPopup::Parse(const String& strDateTime, DateTime & dateTime) default : r = E_UNSUPPORTED_OPTION; SysLogException(NID_WEB_CTRL, r, "[%s] %d is unsupported.", GetErrorMessage(r), __inputType); - return r; } - if (pTmp) - { - free(pTmp); - } + free(pTmp); - return E_SUCCESS; + return r; } diff --git a/src/controls/FWebCtrl_UserConfirmPopup.cpp b/src/controls/FWebCtrl_UserConfirmPopup.cpp index 265b534..fee2180 100755 --- a/src/controls/FWebCtrl_UserConfirmPopup.cpp +++ b/src/controls/FWebCtrl_UserConfirmPopup.cpp @@ -219,6 +219,7 @@ _UserConfirmPopup::GetMessageFromPolicy(void) message = _Utility::CreateOrigin(pSecurityOrigin); message.Append("Requests your Location"); + break; } default: SysAssert(false); @@ -248,6 +249,7 @@ _UserConfirmPopup::HandleUserAction(Eina_Bool allow) result r = AddGeolocationDb(pPolicy, static_cast < bool >(allow)); SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); } + break; } default: SysAssert(false); diff --git a/src/controls/FWebCtrl_Utility.cpp b/src/controls/FWebCtrl_Utility.cpp index cd3cd0b..8f8b6ad 100755 --- a/src/controls/FWebCtrl_Utility.cpp +++ b/src/controls/FWebCtrl_Utility.cpp @@ -75,6 +75,8 @@ _Utility::GetEvasFromUiApp() Evas* pEvas = pEflNode->GetEvas(); SysTryReturn(NID_WEB_CTRL, pEvas, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult())); + + return pEvas; } diff --git a/src/controls/FWebCtrl_Web.cpp b/src/controls/FWebCtrl_Web.cpp index ca64638..965e025 100755 --- a/src/controls/FWebCtrl_Web.cpp +++ b/src/controls/FWebCtrl_Web.cpp @@ -299,13 +299,10 @@ _Web::InitializeWebNativeNode(void) SetNativeObjectFocusable(false); _AccessibilityContainer* pContainer = GetAccessibilityContainer(); - if (pContainer) - { - pContainer->Activate(true); - } + SysTryReturn(NID_WEB_CTRL, pContainer, E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(E_SYSTEM)); + pContainer->Activate(true); _WebAccessibilityFocusHandler* pFocusHandler = new (std::nothrow) _WebAccessibilityFocusHandler(); - pContainer->SetFocusHandler(dynamic_cast<_IAccessibilityFocusHandler*>(pFocusHandler)); return E_SUCCESS; @@ -679,7 +676,7 @@ void _Web::DumpPointList(void* pData) { Eina_List* pList = reinterpret_cast< Eina_List* >(pData); - + for(; pList; pList = eina_list_next(pList)) { Ewk_Touch_Point* pPointDump = static_cast(eina_list_data_get(pList)); @@ -695,7 +692,7 @@ _Web::SendTouchEventForJavaScript(const _TouchInfo& touchInfo) Eina_List* pPointList = null; Ewk_Touch_Point* pPoint = null; - + _TouchManager* pTouchManager = _TouchManager::GetInstance(); SysAssertf(pTouchManager, "Failed to get touch manager."); @@ -708,10 +705,10 @@ _Web::SendTouchEventForJavaScript(const _TouchInfo& touchInfo) FloatPoint currentPoint; _FingerInfo* pFingerInfo = null; while(pTouchListEnum->MoveNext() == E_SUCCESS) - { + { r = pTouchListEnum->GetCurrent(pFingerInfo); - SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); - + SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); + _TouchStatus state = pFingerInfo->GetStatus(); if(state == _TOUCH_PRESSED || state == _TOUCH_MOVED || state == _TOUCH_RELEASED || state == _TOUCH_CANCELED) { @@ -719,13 +716,13 @@ _Web::SendTouchEventForJavaScript(const _TouchInfo& touchInfo) Point integerPoint(_CoordinateSystemUtils::ConvertToInteger(currentPoint)); pPoint = static_cast(calloc(1, sizeof(Ewk_Touch_Point))); - - pPoint->id = pFingerInfo->GetPointId(); + + pPoint->id = pFingerInfo->GetPointId(); pPoint->x = integerPoint.x; pPoint->y = integerPoint.y; pPoint->state = GetEvasTouchState((TouchStatus)pFingerInfo->GetStatus()); - pPointList = eina_list_append(pPointList, pPoint); + pPointList = eina_list_append(pPointList, pPoint); } } DumpPointList(pPointList); diff --git a/src/controls/FWebCtrl_WebStorageManagerImpl.cpp b/src/controls/FWebCtrl_WebStorageManagerImpl.cpp index 486fc73..3fd9552 100755 --- a/src/controls/FWebCtrl_WebStorageManagerImpl.cpp +++ b/src/controls/FWebCtrl_WebStorageManagerImpl.cpp @@ -139,24 +139,27 @@ result _WebStorageManagerImpl::SetQuotaForOrigin(WebStorageType storageType, const String& origin, long quota) { Ewk_Context* pDefaultContext = ewk_context_default_get(); - - SysTryReturnResult(NID_WEB_CTRL, (storageType == WEB_STORAGE_TYPE_WEB_SQL_DATABASE) || (storageType == WEB_STORAGE_TYPE_APPLICATION_CACHE), E_UNSUPPORTED_TYPE, "This storage type is not supported."); - - Ewk_Security_Origin* pOrigin = CompareOrigin(storageType, origin); - SysTryReturnResult(NID_WEB_CTRL, pOrigin, E_INVALID_ARG, "This origin does not exist."); + Ewk_Security_Origin* pOrigin = null; switch (storageType) { case WEB_STORAGE_TYPE_APPLICATION_CACHE: + pOrigin = CompareOrigin(WEB_STORAGE_TYPE_APPLICATION_CACHE, origin); + SysTryReturnResult(NID_WEB_CTRL, pOrigin, E_INVALID_ARG, "This origin does not exist."); + ewk_context_application_cache_quota_for_origin_set(pDefaultContext, pOrigin, quota); break; case WEB_STORAGE_TYPE_WEB_SQL_DATABASE: - ewk_context_web_database_quota_for_origin_set(pDefaultContext, pOrigin, quota); + pOrigin = CompareOrigin(WEB_STORAGE_TYPE_WEB_SQL_DATABASE, origin); + SysTryReturnResult(NID_WEB_CTRL, pOrigin, E_INVALID_ARG, "This origin does not exist."); + + ewk_context_web_database_quota_for_origin_set(pDefaultContext, pOrigin, quota); break; default: - break; + SysLogException(NID_WEB_CTRL, E_UNSUPPORTED_TYPE, "This storage type %d is not supported.", storageType); + return E_UNSUPPORTED_TYPE; } return E_SUCCESS; } @@ -176,19 +179,7 @@ _WebStorageManagerImpl::GetQuotaForOrigin(WebStorageType storageType, const Stri _WebPresenter presenter; presenter.InitAsyncProcess(); - switch (storageType) - { - case WEB_STORAGE_TYPE_APPLICATION_CACHE: - ewk_context_application_cache_usage_for_origin_get(pDefaultContext, pOrigin, OnIntReceived, &presenter); - break; - - case WEB_STORAGE_TYPE_WEB_SQL_DATABASE: - ewk_context_web_database_quota_for_origin_get(pDefaultContext, OnUIntReceived, &presenter, pOrigin); - break; - - default: - break; - } + ewk_context_web_database_quota_for_origin_get(pDefaultContext, OnUIntReceived, &presenter, pOrigin); presenter.WaitAsyncProcess(quota); @@ -341,7 +332,7 @@ _WebStorageManagerImpl::CompareOrigin(WebStorageType storageType, const String& { Ewk_Security_Origin* pOrigin = static_cast(eina_list_data_get(pOriginList)); int cmp = origin.CompareTo(_Utility::CreateOrigin(pOrigin)); - + if (cmp ==0) { return pOrigin; -- 2.7.4