From c950e52328a0714c09e3d6bd85eafeea5f6bda36 Mon Sep 17 00:00:00 2001 From: Jiyun Yang Date: Mon, 20 Apr 2020 17:59:57 +0900 Subject: [PATCH] Remove unused post render callback that causes unexpected errors Change-Id: I906913dd2db3312b8c09dc2559b8666e346761ec Signed-off-by: Jiyun Yang --- .../internal/evas-plugin/evas-event-handler.cpp | 16 ---------------- dali-extension/internal/evas-plugin/evas-event-handler.h | 9 --------- .../internal/evas-plugin/evas-event-interface.h | 5 ----- dali-extension/internal/evas-plugin/scene-impl.cpp | 4 ---- dali-extension/internal/evas-plugin/scene-impl.h | 5 ----- 5 files changed, 39 deletions(-) diff --git a/dali-extension/internal/evas-plugin/evas-event-handler.cpp b/dali-extension/internal/evas-plugin/evas-event-handler.cpp index 1909df5..517cbd5 100644 --- a/dali-extension/internal/evas-plugin/evas-event-handler.cpp +++ b/dali-extension/internal/evas-plugin/evas-event-handler.cpp @@ -475,9 +475,6 @@ EvasEventHandler::EvasEventHandler( EvasEventInterface& evasEventInterface ) evas_event_callback_add( renderTargetAsEvas, EVAS_CALLBACK_CANVAS_FOCUS_IN, OnEvasFocusIn, &evasEventInterface ); evas_event_callback_add( renderTargetAsEvas, EVAS_CALLBACK_CANVAS_FOCUS_OUT, OnEvasFocusOut, &evasEventInterface ); - // Register the evas render callbacks - evas_event_callback_add( renderTargetAsEvas, EVAS_CALLBACK_RENDER_POST, OnEvasRenderPost, &evasEventInterface ); - // Register the elm access action callbacks and these callbacks are disconnected when mElmAccessEvasObject is unregistred elm_access_action_cb_set( accessibilityTarget, ELM_ACCESS_ACTION_HIGHLIGHT, OnElmAccessActionHighlight, &evasEventInterface ); elm_access_action_cb_set( accessibilityTarget, ELM_ACCESS_ACTION_UNHIGHLIGHT, OnElmAccessActionUnhighlight, &evasEventInterface ); @@ -530,9 +527,6 @@ EvasEventHandler::~EvasEventHandler() evas_event_callback_del( renderTargetAsEvas, EVAS_CALLBACK_CANVAS_FOCUS_IN, OnEvasFocusIn ); evas_event_callback_del( renderTargetAsEvas, EVAS_CALLBACK_CANVAS_FOCUS_OUT, OnEvasFocusOut ); - // Register the evas render callbacks - evas_event_callback_del( renderTargetAsEvas, EVAS_CALLBACK_RENDER_POST, OnEvasRenderPost ); - // Unregister the elm focus callbacks evas_object_smart_callback_del( focusTarget, EVAS_OBJECT_FOCUSED_EVENT_NAME, OnEvasObjectSmartFocused ); evas_object_smart_callback_del( focusTarget, EVAS_OBJECT_UNFOCUSED_EVENT_NAME, OnEvasObjectSmartUnfocused ); @@ -792,16 +786,6 @@ void EvasEventHandler::OnEvasFocusOut( void *data, Evas* evas, void* event ) } ///////////////////////////////////////////////////////////////////////////////////////////////////// -// Render callbacks -///////////////////////////////////////////////////////////////////////////////////////////////////// - -void EvasEventHandler::OnEvasRenderPost( void *data, Evas* evas, void* event ) -{ - EvasEventInterface* eventInterface = static_cast( data ); - eventInterface->OnEvasPostRender(); -} - -///////////////////////////////////////////////////////////////////////////////////////////////////// // Elm Access callbacks ///////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/dali-extension/internal/evas-plugin/evas-event-handler.h b/dali-extension/internal/evas-plugin/evas-event-handler.h index 7041f49..f77c30b 100644 --- a/dali-extension/internal/evas-plugin/evas-event-handler.h +++ b/dali-extension/internal/evas-plugin/evas-event-handler.h @@ -172,15 +172,6 @@ private: static void OnEvasFocusOut( void *data, Evas* evas, void* event ); ///////////////////////////////////////////////////////////////////////////////////////////////////// - // Render callbacks - ///////////////////////////////////////////////////////////////////////////////////////////////////// - - /** - * @brief Called when evas render post - */ - static void OnEvasRenderPost( void *data, Evas* evas, void* event ); - - ///////////////////////////////////////////////////////////////////////////////////////////////////// // Elm Access callbacks ///////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/dali-extension/internal/evas-plugin/evas-event-interface.h b/dali-extension/internal/evas-plugin/evas-event-interface.h index 1b38999..d940186 100644 --- a/dali-extension/internal/evas-plugin/evas-event-interface.h +++ b/dali-extension/internal/evas-plugin/evas-event-interface.h @@ -144,11 +144,6 @@ public: */ virtual void OnEvasObjectFocusOut() = 0; - /** - * @brief Handle evas object render post - */ - virtual void OnEvasPostRender() = 0; - /** * @brief Called when the accessibility action event dispatched from elm_access. * @param[in] accessActionInfo elm accessibility action information structure diff --git a/dali-extension/internal/evas-plugin/scene-impl.cpp b/dali-extension/internal/evas-plugin/scene-impl.cpp index 548017f..9c6f340 100644 --- a/dali-extension/internal/evas-plugin/scene-impl.cpp +++ b/dali-extension/internal/evas-plugin/scene-impl.cpp @@ -290,10 +290,6 @@ void Scene::OnEvasObjectFocusOut() } } -void Scene::OnEvasPostRender() -{ -} - bool Scene::OnElmAccessibilityActionEvent( AccessActionInfo& accessActionInfo ) { bool ret = false; diff --git a/dali-extension/internal/evas-plugin/scene-impl.h b/dali-extension/internal/evas-plugin/scene-impl.h index 4a5660d..c31b70e 100644 --- a/dali-extension/internal/evas-plugin/scene-impl.h +++ b/dali-extension/internal/evas-plugin/scene-impl.h @@ -211,11 +211,6 @@ private: void OnEvasObjectFocusOut() override; /** - * @copydoc Dali::Extension::Internal::EvasEventInterface::OnEvasRenderPost - */ - void OnEvasPostRender() override; - - /** * @copydoc Dali::Extension::Internal::EvasEventInterface::OnElmAccessibilityActionEvent */ bool OnElmAccessibilityActionEvent( AccessActionInfo& actionInfo ) override; -- 2.7.4