From ae8e7e0f11edb0f0e9558f30688fba1a55c2df38 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Artur=20=C5=9Awigo=C5=84?= <a.swigon@samsung.com>
Date: Thu, 28 Mar 2024 13:11:51 +0100
Subject: [PATCH] [Tizen][AT-SPI] Move AccessibilityAttributes to Accessible

Change-Id: If598bb6c0bb2cb3d40e4b542eaed499eead71ab0
---
 .../internal/widget_view/widget_view_impl.cpp      | 14 +++++++++-----
 .../internal/widget_view/widget_view_impl.h        |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
index 26c6115..4618fa9 100644
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -2062,16 +2062,20 @@ void WidgetView::WidgetViewAccessible::DoGetChildren(std::vector<Dali::Accessibi
   }
 }
 
-Dali::Accessibility::Attributes WidgetView::WidgetViewAccessible::GetAttributes() const
+void WidgetView::WidgetViewAccessible::UpdateAttributes(Dali::Accessibility::Attributes& attributes) const
 {
-  auto attributes = Dali::Toolkit::DevelControl::ControlAccessible::GetAttributes();
+  static const std::string childBusKey = "child_bus";
+
+  ControlAccessible::UpdateAttributes(attributes);
 
   if(mRemoteChild.GetAddress())
   {
-    attributes.insert_or_assign("child_bus", mRemoteChild.GetAddress().GetBus());
+    attributes.insert_or_assign(childBusKey, mRemoteChild.GetAddress().GetBus());
+  }
+  else
+  {
+    attributes.erase(childBusKey);
   }
-
-  return attributes;
 }
 
 } // namespace Internal
diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.h b/widget_viewer_dali/internal/widget_view/widget_view_impl.h
index 670c357..7b63243 100644
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.h
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.h
@@ -501,9 +501,9 @@ protected:
     void DoGetChildren(std::vector<Dali::Accessibility::Accessible*>& children) override;
 
     /**
-     * @copydoc Dali::Accessibility::Accessible::GetAttributes()
+     * @copydoc Dali::Accessibility::Accessible::UpdateAttributes()
      */
-    Dali::Accessibility::Attributes GetAttributes() const override;
+    void UpdateAttributes(Dali::Accessibility::Attributes& attributes) const override;
 
   private:
     Dali::Accessibility::ProxyAccessible mRemoteChild;
-- 
2.34.1