From e7154d3cbf0c0d4f1549273825a7937f9f758686 Mon Sep 17 00:00:00 2001 From: Prakalathan Ponnusamy Date: Tue, 25 Jun 2013 17:16:54 +0530 Subject: [PATCH] Fix for Prevent issue Change-Id: I0aa501b40c8c01443f3551df2c7141d56e40eadb --- src/ui/controls/FUiCtrl_AnimationPresenter.cpp | 5 ++++- src/ui/controls/FUiCtrl_DateTimeBar.cpp | 5 +++-- src/ui/controls/FUiCtrl_EditDatePresenter.cpp | 3 --- src/ui/controls/FUiCtrl_FastScrollIndex.cpp | 3 +++ src/ui/controls/FUiCtrl_FastScrollPresenter.cpp | 3 +++ src/ui/controls/FUiCtrl_GalleryRenderer.cpp | 6 +++--- src/ui/controls/FUiCtrl_IconListItem.cpp | 4 +++- src/ui/controls/FUiCtrl_IconListPresenter.cpp | 8 ++++++-- src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp | 2 +- src/ui/controls/FUiCtrl_TableViewItem.cpp | 4 ++++ src/ui/controls/FUiCtrl_TokenEditPresenter.cpp | 16 ++++++++++++---- 11 files changed, 42 insertions(+), 17 deletions(-) diff --git a/src/ui/controls/FUiCtrl_AnimationPresenter.cpp b/src/ui/controls/FUiCtrl_AnimationPresenter.cpp index 321aba9..abbc446 100644 --- a/src/ui/controls/FUiCtrl_AnimationPresenter.cpp +++ b/src/ui/controls/FUiCtrl_AnimationPresenter.cpp @@ -266,6 +266,7 @@ _AnimationPresenter::GetStatus(void) const Canvas* _AnimationPresenter::OnCanvasRequestedN(const FloatRectangle& bounds) { + result r = E_SUCCESS; Canvas* pCanvas = null; AnimationFrame* pFrame = null; @@ -280,7 +281,9 @@ _AnimationPresenter::OnCanvasRequestedN(const FloatRectangle& bounds) //Decode the bitmap explicitly pBitmap->IsNinePatchedBitmap(); - Draw(); + r = Draw(); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r)); + pCanvas = __pAnimation->GetCanvasN(); } diff --git a/src/ui/controls/FUiCtrl_DateTimeBar.cpp b/src/ui/controls/FUiCtrl_DateTimeBar.cpp index 27e407a..db9c642 100644 --- a/src/ui/controls/FUiCtrl_DateTimeBar.cpp +++ b/src/ui/controls/FUiCtrl_DateTimeBar.cpp @@ -823,9 +823,11 @@ _DateTimeBar::OnAccessibilityValueDecreased(const Tizen::Ui::_AccessibilityConta _AccessibilityElement* _DateTimeBar::GetAccessibilityElementAt(int index) const { + result r = E_SUCCESS; _AccessibilityElement* pAccessibilityElement = null; - __accessibilityElements.GetAt(index, pAccessibilityElement); + r = __accessibilityElements.GetAt(index, pAccessibilityElement); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r)); return pAccessibilityElement; } @@ -917,7 +919,6 @@ _DateTimeBar::CreateAnimationN(VisualElement& source, bool open) CATCH: delete pAnimationGroup; - delete pOpacityAnimation; delete pOpenUserData; delete pCloseUserData; return null; diff --git a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp index 09b2d37..8a07e32 100644 --- a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp @@ -1536,9 +1536,6 @@ CATCH: delete pOldBoundsAnimation; pOldBoundsAnimation = null; - delete pCanvas; - pCanvas = null; - delete pOldSimpleText; pOldSimpleText = null; diff --git a/src/ui/controls/FUiCtrl_FastScrollIndex.cpp b/src/ui/controls/FUiCtrl_FastScrollIndex.cpp index ed2683d..af0bb6e 100644 --- a/src/ui/controls/FUiCtrl_FastScrollIndex.cpp +++ b/src/ui/controls/FUiCtrl_FastScrollIndex.cpp @@ -470,8 +470,11 @@ _FastScrollIndex::AddChildTextIndexArray(int childOrder, const wchar_t* pTextInd CATCH: delete indexText; + indexText = null; delete pChildIndexList; + pChildIndexList = null; delete pFirstIndexList; + pFirstIndexList = null; delete[] pTempChar; return r; diff --git a/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp b/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp index a30345c..bb3fcb0 100644 --- a/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp +++ b/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp @@ -3094,7 +3094,10 @@ _FastScrollPresenter::OnTouchPressedAndMoved(const FloatPoint& point, bool isPre if (pSelectedIndex->GetNextIndexList() || pSelectedIndex->GetPreviousIndexList()) { _FastScrollIndexView* pIndexView = GetIndexView(__focusedIndexLevel); + SysTryReturn(NID_UI_CTRL, pIndexView != null, true, r, "[%s] Propagating.", GetErrorMessage(r)); + _FastScrollIndex* pBaseIndex = pIndexView->GetBaseIndex(); + SysTryReturn(NID_UI_CTRL, pBaseIndex != null, true, r, "[%s] Propagating.", GetErrorMessage(r)); bool isNext = true; if (pSelectedIndex->GetNextIndexList()) diff --git a/src/ui/controls/FUiCtrl_GalleryRenderer.cpp b/src/ui/controls/FUiCtrl_GalleryRenderer.cpp index 8671e7a..789f7e1 100644 --- a/src/ui/controls/FUiCtrl_GalleryRenderer.cpp +++ b/src/ui/controls/FUiCtrl_GalleryRenderer.cpp @@ -148,14 +148,14 @@ result _GalleryRenderer::SetCanvasShowState(int canvasIndex, bool showState) { _GalleryCanvas* pCanvas = GetCanvasManager().GetCanvas(canvasIndex); + result r = GetLastResult(); + SysTryReturn(NID_UI_CTRL, pCanvas != null, r, r, "[%s] Propagating.", GetErrorMessage(r)); + if (pCanvas->IsVisibility() == showState) { return E_SUCCESS; } - result r = GetLastResult(); - SysTryReturn(NID_UI_CTRL, pCanvas != null, r, r, "[%s] Propagating.", GetErrorMessage(r)); - return pCanvas->SetVisibility(showState); } diff --git a/src/ui/controls/FUiCtrl_IconListItem.cpp b/src/ui/controls/FUiCtrl_IconListItem.cpp index 10672d7..e45ac14 100644 --- a/src/ui/controls/FUiCtrl_IconListItem.cpp +++ b/src/ui/controls/FUiCtrl_IconListItem.cpp @@ -804,8 +804,8 @@ _IconListItem::DrawBorder(Tizen::Graphics::Canvas& canvas, bool isFocused) } break; } - __pFocusVE->SetShowState(false); } + __pFocusVE->SetShowState(false); } return E_SUCCESS; } @@ -1033,6 +1033,8 @@ _IconListItem::SetItemAccessibilityElement(FloatRectangle& rect, int itemIndex, if (__pAccessibilityElement == null) { __pAccessibilityElement = new (std::nothrow) _AccessibilityElement(true); + SysTryReturn(NID_UI_CTRL, __pAccessibilityElement != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + __pAccessibilityElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_IMAGE"); } diff --git a/src/ui/controls/FUiCtrl_IconListPresenter.cpp b/src/ui/controls/FUiCtrl_IconListPresenter.cpp index 130578d..4d7da9c 100644 --- a/src/ui/controls/FUiCtrl_IconListPresenter.cpp +++ b/src/ui/controls/FUiCtrl_IconListPresenter.cpp @@ -3689,9 +3689,11 @@ _IconListPresenter::RequestToDrawAccessibilityFocusUi(void) __pListModel->GetFirstLoadedItemIndex(firstLoadedGroupIndex, firstLoadedItemIndex); __pListModel->GetLastLoadedItemIndex(lastLoadedGroupIndex, lastLoadedItemIndex); - for (int i=firstLoadedItemIndex; i < __firstDrawnIndex; i++) + for (int i = firstLoadedItemIndex; i < __firstDrawnIndex; i++) { pItem = dynamic_cast <_IconListItem*>(__pListModel->LoadItem(DEFAULT_GROUP_INDEX, i)); + SysTryReturnVoidResult(NID_UI_CTRL, (pItem != null), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult())); + if (pItem->GetItemAccessibilityElement() != null) { pItem->GetItemAccessibilityElement()->Activate(false); @@ -3699,9 +3701,11 @@ _IconListPresenter::RequestToDrawAccessibilityFocusUi(void) } - for (int i=__lastDrawnIndex+1; i <= lastLoadedItemIndex; i++) + for (int i = __lastDrawnIndex+1; i <= lastLoadedItemIndex; i++) { pItem = dynamic_cast <_IconListItem*>(__pListModel->LoadItem(DEFAULT_GROUP_INDEX, i)); + SysTryReturnVoidResult(NID_UI_CTRL, (pItem != null), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult())); + if (pItem->GetItemAccessibilityElement() != null) { pItem->GetItemAccessibilityElement()->Activate(false); diff --git a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp index c90e50d..eace41a 100644 --- a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp +++ b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp @@ -609,7 +609,7 @@ _MessageBoxPresenter::ProcessEvent(void) switch (exitCode) { case MSGBOX_BUTTON_CLICKED: - if (__pButtonListener->IsButtonClicked()) + if (__pButtonListener != null && __pButtonListener->IsButtonClicked()) { handle = __pButtonListener->GetClickedButtonHandle(); FindButtonAndResult(handle); diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp index 24a093a..7b78429 100644 --- a/src/ui/controls/FUiCtrl_TableViewItem.cpp +++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp @@ -4653,6 +4653,8 @@ _TableViewItem::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo) { _KeyCode keyCode = keyInfo.GetKeyCode(); IListT<_Control*>* pFocusList = GetFocusListN(); + SysTryReturn(NID_UI_CTRL, pFocusList != null, true, GetLastResult(), "[%s] propagating.", GetErrorMessage(GetLastResult())); + _Control* pChildControl = null; _Control* pFocusedControl = null; _Window* pTop = source.GetRootWindow(); @@ -4875,6 +4877,8 @@ _TableViewItem::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) if(keyCode == _KEY_ENTER) { _TableView* pParent = dynamic_cast<_TableView*>(GetParent()); + SysTryReturn(NID_UI_CTRL, pParent != null, true, GetLastResult(), "[%s] propagating.", GetErrorMessage(GetLastResult())); + pParent->StopExpandCollapseAnimation(); if (&source == this) { diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp index 2416eeb..b0d5310 100644 --- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp +++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp @@ -4318,7 +4318,9 @@ _TokenEditPresenter::ScrollToFocusedTokenAccessibilityElement(const _Accessibili SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); } - __accessibilityElements.GetAt(focusedTokenIndex, pAccessibilityElement); + r = __accessibilityElements.GetAt(focusedTokenIndex, pAccessibilityElement); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + _AccessibilityManager* pAccessibilityManager = _AccessibilityManager::GetInstance(); pAccessibilityManager->SetGlobalFocusedElement(*pAccessibilityElement); pAccessibilityManager->RequestToDrawFocusUi(); @@ -4330,6 +4332,7 @@ _TokenEditPresenter::ScrollToFocusedTokenAccessibilityElement(const _Accessibili bool _TokenEditPresenter::OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element) { + result r = E_SUCCESS; if (__focusOutIndex < 0) // Not a token accessibility element { return false; @@ -4339,7 +4342,8 @@ _TokenEditPresenter::OnAccessibilityFocusIn(const _AccessibilityContainer& contr _AccessibilityElement* pCurrentElement = const_cast< _AccessibilityElement* >(&element); _AccessibilityElement* pPreviousAccessibilityElement = null; _AccessibilityElement* pNextAccessibilityElement = null; - __accessibilityElements.GetAt(__focusOutIndex, pPreviousAccessibilityElement); + r = __accessibilityElements.GetAt(__focusOutIndex, pPreviousAccessibilityElement); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, true, r, "[%s] Propagating.", GetErrorMessage(r)); if (pPreviousAccessibilityElement && pPreviousAccessibilityElement->GetAbsoluteBounds().y > element.GetAbsoluteBounds().y) //Left flick { @@ -4348,7 +4352,9 @@ _TokenEditPresenter::OnAccessibilityFocusIn(const _AccessibilityContainer& contr { if (pToken->displayRect.y < 0.0f && __focusOutIndex > 0) { - __accessibilityElements.GetAt(__focusOutIndex - 1, pNextAccessibilityElement); + r = __accessibilityElements.GetAt(__focusOutIndex - 1, pNextAccessibilityElement); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, true, r, "[%s] Propagating.", GetErrorMessage(r)); + ScrollToFocusedTokenAccessibilityElement(*pNextAccessibilityElement); } } @@ -4361,7 +4367,9 @@ _TokenEditPresenter::OnAccessibilityFocusIn(const _AccessibilityContainer& contr { if (pToken->displayRect.y + pToken->displayRect.height > __pTokenEdit->GetBoundsF().height) { - __accessibilityElements.GetAt(__focusOutIndex + 1, pNextAccessibilityElement); + r = __accessibilityElements.GetAt(__focusOutIndex + 1, pNextAccessibilityElement); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, true, r, "[%s] Propagating.", GetErrorMessage(r)); + ScrollToFocusedTokenAccessibilityElement(*pNextAccessibilityElement); } } -- 2.7.4