[Tizen][AT-SPI] Move AccessibilityAttributes to Accessible

Change-Id: If598bb6c0bb2cb3d40e4b542eaed499eead71ab0

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 26c61154c66fddd555ff2f2d46ccb26abcf51750..4618fa9138ceb1d4b110aa18a31f003653566447 100644 (file)
--- 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 670c357ae269c4fbf031c5430d95fb888782ef3c..7b632436d7c82d9f20776d36364b9e291297d1a3 100644 (file)
--- 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;