From c7d6824912dc232e9e3eb46d1fb9b32710bf285d Mon Sep 17 00:00:00 2001
From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Wed, 25 Aug 2021 17:29:00 +0900
Subject: [PATCH] [ATSPI] Change function names for Window

- The original role of ApplicationShown/Hidden is to show/hide 'Window', not Application.
 Therefore, the name of ApplicationShown/Hidden must be changed to
 WindowShown/Hidden.

Change-Id: I58fc8945d8efc95e7f3d73d5a1cf8654baa2f767
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
---
 dali/devel-api/adaptor-framework/accessibility-impl.h | 8 ++++----
 dali/internal/accessibility/bridge/bridge-impl.cpp    | 6 +++---
 dali/internal/accessibility/bridge/dummy-atspi.h      | 4 ++--
 dali/internal/adaptor/common/adaptor-impl.cpp         | 6 +++---
 dali/internal/adaptor/common/application-impl.cpp     | 2 +-
 dali/internal/window-system/common/window-impl.cpp    | 4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dali/devel-api/adaptor-framework/accessibility-impl.h b/dali/devel-api/adaptor-framework/accessibility-impl.h
index ff8933a..6876dd6 100644
--- a/dali/devel-api/adaptor-framework/accessibility-impl.h
+++ b/dali/devel-api/adaptor-framework/accessibility-impl.h
@@ -144,14 +144,14 @@ struct DALI_ADAPTOR_API Bridge
   virtual Accessible* FindByPath(const std::string& path) const = 0;
 
   /**
-   * @brief Shows application on accessibility bus.
+   * @brief Notifies accessibility dbus that window has just been shown.
    */
-  virtual void ApplicationShown() = 0;
+  virtual void WindowShown() = 0;
 
   /**
-   * @brief Hides application on accessibility bus.
+   * @brief Notifies accessibility dbus that window has just been hidden.
    */
-  virtual void ApplicationHidden() = 0;
+  virtual void WindowHidden() = 0;
 
   /**
    * @brief Initializes accessibility bus.
diff --git a/dali/internal/accessibility/bridge/bridge-impl.cpp b/dali/internal/accessibility/bridge/bridge-impl.cpp
index b424b6a..aaed7fb 100644
--- a/dali/internal/accessibility/bridge/bridge-impl.cpp
+++ b/dali/internal/accessibility/bridge/bridge-impl.cpp
@@ -297,7 +297,7 @@ public:
     }
   }
 
-  void ApplicationHidden() override
+  void WindowHidden() override
   {
     if(isShown && IsUp())
     {
@@ -306,7 +306,7 @@ public:
     isShown = false;
   }
 
-  void ApplicationShown() override
+  void WindowShown() override
   {
     if(!isShown && IsUp())
     {
@@ -426,6 +426,6 @@ void Bridge::EnableAutoInit()
 
   if(window && window.IsVisible())
   {
-    bridge->ApplicationShown();
+    bridge->WindowShown();
   }
 }
diff --git a/dali/internal/accessibility/bridge/dummy-atspi.h b/dali/internal/accessibility/bridge/dummy-atspi.h
index 55b5495..bcdc26a 100644
--- a/dali/internal/accessibility/bridge/dummy-atspi.h
+++ b/dali/internal/accessibility/bridge/dummy-atspi.h
@@ -65,11 +65,11 @@ struct DummyBridge : Dali::Accessibility::Bridge
     return nullptr;
   }
 
-  void ApplicationShown() override
+  void WindowShown() override
   {
   }
 
-  void ApplicationHidden() override
+  void WindowHidden() override
   {
   }
 
diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp
index c00add5..831b75c 100644
--- a/dali/internal/adaptor/common/adaptor-impl.cpp
+++ b/dali/internal/adaptor/common/adaptor-impl.cpp
@@ -336,7 +336,7 @@ void Adaptor::AccessibilityObserver::OnAccessibleKeyEvent(const Dali::KeyEvent&
 
 Adaptor::~Adaptor()
 {
-  Accessibility::Bridge::GetCurrentBridge()->ApplicationHidden();
+  Accessibility::Bridge::GetCurrentBridge()->WindowHidden();
   Accessibility::Bridge::GetCurrentBridge()->Terminate();
 
   // Ensure stop status
@@ -955,7 +955,7 @@ void Adaptor::RequestProcessEventsOnIdle(bool forceProcess)
 
 void Adaptor::OnWindowShown()
 {
-  Dali::Accessibility::Bridge::GetCurrentBridge()->ApplicationShown();
+  Dali::Accessibility::Bridge::GetCurrentBridge()->WindowShown();
 
   if(PAUSED_WHILE_HIDDEN == mState)
   {
@@ -987,7 +987,7 @@ void Adaptor::OnWindowShown()
 
 void Adaptor::OnWindowHidden()
 {
-  Dali::Accessibility::Bridge::GetCurrentBridge()->ApplicationHidden();
+  Dali::Accessibility::Bridge::GetCurrentBridge()->WindowHidden();
 
   if(RUNNING == mState || READY == mState)
   {
diff --git a/dali/internal/adaptor/common/application-impl.cpp b/dali/internal/adaptor/common/application-impl.cpp
index fadfc0c..b942190 100644
--- a/dali/internal/adaptor/common/application-impl.cpp
+++ b/dali/internal/adaptor/common/application-impl.cpp
@@ -238,7 +238,7 @@ void Application::Quit()
 
 void Application::QuitFromMainLoop()
 {
-  Accessibility::Bridge::GetCurrentBridge()->ApplicationHidden();
+  Accessibility::Bridge::GetCurrentBridge()->WindowHidden();
   Accessibility::Bridge::GetCurrentBridge()->Terminate();
 
   mAdaptor->Stop();
diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp
index 2d88bb3..a9ba67e 100644
--- a/dali/internal/window-system/common/window-impl.cpp
+++ b/dali/internal/window-system/common/window-impl.cpp
@@ -750,11 +750,11 @@ void Window::OnFocusChanged(bool focusIn)
   {
     if(focusIn)
     {
-      bridge->ApplicationShown();
+      bridge->WindowShown();
     }
     else
     {
-      bridge->ApplicationHidden();
+      bridge->WindowHidden();
     }
   }
 }
-- 
2.7.4