From 31e1ac046b61e163c735ea59ccbfcd14de847da6 Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Wed, 25 Oct 2023 16:36:34 +0900 Subject: [PATCH] Revert "[TIzen] Add API for check core shutting down or not" This reverts commit b6f0405450f2a06b20141feb0a3c9e784444a95f. --- automated-tests/src/dali/utc-Dali-Stage.cpp | 39 --------------------- dali/devel-api/common/stage.cpp | 13 +------ dali/devel-api/common/stage.h | 17 +-------- dali/internal/event/common/stage-impl.cpp | 5 --- dali/internal/event/common/stage-impl.h | 5 --- 5 files changed, 2 insertions(+), 77 deletions(-) diff --git a/automated-tests/src/dali/utc-Dali-Stage.cpp b/automated-tests/src/dali/utc-Dali-Stage.cpp index 4105e04ba..b9b805007 100644 --- a/automated-tests/src/dali/utc-Dali-Stage.cpp +++ b/automated-tests/src/dali/utc-Dali-Stage.cpp @@ -387,45 +387,6 @@ int UtcDaliStageIsInstalledN(void) END_TEST; } -int UtcDaliStageIsShuttingDown(void) -{ - DALI_TEST_CHECK(!Stage::IsShuttingDown()); - - { - TestApplication application; - - DALI_TEST_CHECK(!Stage::IsShuttingDown()); - - Stage::GetCurrent(); - - DALI_TEST_CHECK(!Stage::IsShuttingDown()); - } - - // Core destroyed - DALI_TEST_CHECK(Stage::IsShuttingDown()); - END_TEST; -} - -int UtcDaliStageIsCoreInstalled(void) -{ - DALI_TEST_CHECK(!Stage::IsCoreInstalled()); - - { - TestApplication application; - - DALI_TEST_CHECK(Stage::IsCoreInstalled()); - - Stage::GetCurrent(); - - DALI_TEST_CHECK(Stage::IsCoreInstalled()); - } - - // Core destroyed - DALI_TEST_CHECK(Stage::IsCoreInstalled()); - END_TEST; -} - - int UtcDaliStageCopyConstructorP(void) { TestApplication application; diff --git a/dali/devel-api/common/stage.cpp b/dali/devel-api/common/stage.cpp index 9e013b025..02f361fa0 100644 --- a/dali/devel-api/common/stage.cpp +++ b/dali/devel-api/common/stage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,17 +59,6 @@ bool Stage::IsInstalled() return Internal::Stage::IsInstalled(); } -bool Stage::IsShuttingDown() -{ - return Internal::Stage::IsShuttingDown(); -} - -bool Stage::IsCoreInstalled() -{ - return IsInstalled() || ///< Check if Core is installed now, - IsShuttingDown(); ///< or Core is shutting down now. -} - void Stage::Add(Actor& actor) { GetImplementation(*this).Add(GetImplementation(actor)); diff --git a/dali/devel-api/common/stage.h b/dali/devel-api/common/stage.h index ad94e374e..cf271cfba 100644 --- a/dali/devel-api/common/stage.h +++ b/dali/devel-api/common/stage.h @@ -2,7 +2,7 @@ #define DALI_STAGE_H /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -113,21 +113,6 @@ public: */ static bool IsInstalled(); - /** - * @brief Queries whether the Stage shutting down now; this should only return false during or before destruction of Dali core. - * - * @return True when Dali core destructor called. - */ - static bool IsShuttingDown(); - - /** - * @brief Queries whether we installed Dali core before, or not. - * It will be useful whether you want to check we are on valid ui thread or not, after Core initalized ensured. - * - * @return True when Dali core destructor called. - */ - static bool IsCoreInstalled(); - /** * @brief Destructor. * diff --git a/dali/internal/event/common/stage-impl.cpp b/dali/internal/event/common/stage-impl.cpp index ae0b7d2fe..d2309d651 100644 --- a/dali/internal/event/common/stage-impl.cpp +++ b/dali/internal/event/common/stage-impl.cpp @@ -112,11 +112,6 @@ bool Stage::IsInstalled() return ThreadLocalStorage::Created(); } -bool Stage::IsShuttingDown() -{ - return ThreadLocalStorage::IsShuttingDown(); -} - ObjectRegistry& Stage::GetObjectRegistry() { return ThreadLocalStorage::Get().GetObjectRegistry(); diff --git a/dali/internal/event/common/stage-impl.h b/dali/internal/event/common/stage-impl.h index 8b4abed11..8711fcf71 100644 --- a/dali/internal/event/common/stage-impl.h +++ b/dali/internal/event/common/stage-impl.h @@ -89,11 +89,6 @@ public: */ static bool IsInstalled(); - /** - * @copydoc Dali::Stage::IsShuttingDown(). - */ - static bool IsShuttingDown(); - /** * @copydoc Dali::Stage::GetObjectRegistry() */ -- 2.34.1