From: Seoyeon Kim Date: Tue, 29 Jun 2021 03:29:11 +0000 (+0000) Subject: Merge "[AT-SPI] Remove Role check in AcceptObject" into devel/master X-Git-Tag: dali_2.0.33~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=05c7634cc5730d4b1b36f81552d1ef981ed8d77e;hp=3139066d07385194a7524466ef282e7565fef3ec;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Merge "[AT-SPI] Remove Role check in AcceptObject" into devel/master --- diff --git a/dali/internal/accessibility/bridge/bridge-accessible.cpp b/dali/internal/accessibility/bridge/bridge-accessible.cpp index ed4a81c..4fcd582 100644 --- a/dali/internal/accessibility/bridge/bridge-accessible.cpp +++ b/dali/internal/accessibility/bridge/bridge-accessible.cpp @@ -58,46 +58,6 @@ void BridgeAccessible::RegisterInterfaces() dbusServer.addInterface("/", desc, true); } -static bool AcceptObjectCheckRole(Component* obj) -{ - if(!obj) - return false; - switch(obj->GetRole()) - { - case Role::APPLICATION: - case Role::FILLER: - case Role::SCROLL_PANE: - case Role::SPLIT_PANE: - case Role::WINDOW: - case Role::IMAGE: - case Role::IMAGE_MAP: - case Role::LIST: - case Role::ICON: - case Role::TOOL_BAR: - case Role::REDUNDANT_OBJECT: - case Role::COLOR_CHOOSER: - case Role::TREE_TABLE: - case Role::PAGE_TAB_LIST: - case Role::PAGE_TAB: - case Role::SPIN_BUTTON: - case Role::INPUT_METHOD_WINDOW: - case Role::EMBEDDED: - case Role::INVALID: - case Role::NOTIFICATION: - case Role::DATE_EDITOR: - case Role::TABLE: - { - return false; - } - default: - { - break; - } - } - - return true; -} - static bool AcceptObjectCheckRelations(Component* obj) { auto r = obj->GetRelationSet(); @@ -152,8 +112,6 @@ static bool AcceptObject(Component* obj) const auto states = obj->GetStates(); if(!states[State::VISIBLE]) return false; - if(!AcceptObjectCheckRole(obj)) - return false; if(!AcceptObjectCheckRelations(obj)) return false; if(!states[State::HIGHLIGHTABLE])