From: Mike Gorse <mgorse@suse.com>
Date: Wed, 24 Feb 2016 22:18:11 +0000 (-0600)
Subject: Don't send children of gtk menus to be cached
X-Git-Tag: AT_SPI2_ATK_2_19_91~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ca5179f231dc7a4c68e63129abfab9de1436282;p=platform%2Fupstream%2Fat-spi2-atk.git

Don't send children of gtk menus to be cached

This is o(n^2) because of the way gtk's atk implementation implements
get_index_in_parent(). WOrking around it here for now.

https://bugzilla.gnome.org/show_bug.cgi?id=754048
---

diff --git a/atk-adaptor/adaptors/cache-adaptor.c b/atk-adaptor/adaptors/cache-adaptor.c
index 7162aad..cd93609 100644
--- a/atk-adaptor/adaptors/cache-adaptor.c
+++ b/atk-adaptor/adaptors/cache-adaptor.c
@@ -62,6 +62,45 @@
 
 /*---------------------------------------------------------------------------*/
 
+static const char *
+get_toolkit_name (AtkObject *obj)
+{
+  static const char *toolkit_name = NULL;
+
+  if (!toolkit_name)
+    toolkit_name = atk_get_toolkit_name ();
+
+  /* TODO: query object attributes */
+  return toolkit_name;
+}
+
+static gboolean
+should_call_index_in_parent (AtkObject *obj, AtkStateSet *set)
+{
+  if (atk_state_set_contains_state (set, ATK_STATE_TRANSIENT))
+    return FALSE;
+
+  if (!strcmp (get_toolkit_name (obj), "gtk") &&
+      atk_object_get_role (obj) == ATK_ROLE_MENU_ITEM)
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+should_cache_children (AtkObject *obj, AtkStateSet *set)
+{
+  if (atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS) ||
+      atk_state_set_contains_state (set, ATK_STATE_DEFUNCT))
+    return FALSE;
+
+  if (!strcmp (get_toolkit_name (obj), "gtk") &&
+      atk_object_get_role (obj) == ATK_ROLE_MENU)
+    return FALSE;
+
+  return TRUE;
+}
+
 /*
  * Marshals the given AtkObject into the provided D-Bus iterator.
  *
@@ -139,14 +178,14 @@ append_cache_item (AtkObject * obj, gpointer data)
     }
 
   /* Marshal index in parent */
-  index = (atk_state_set_contains_state (set, ATK_STATE_TRANSIENT)
-           ? -1 : atk_object_get_index_in_parent (obj));
+  index = (should_call_index_in_parent (obj, set)
+           ? atk_object_get_index_in_parent (obj) : -1);
   dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &index);
 
   /* marshal child count */
-  count = (atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS) ||
-           atk_state_set_contains_state (set, ATK_STATE_DEFUNCT))
-           ? -1 : atk_object_get_n_accessible_children (obj);
+  count = (should_cache_children (obj, set)
+           ? atk_object_get_n_accessible_children (obj) : -1);
+
   if (ATK_IS_SOCKET (obj) && atk_socket_is_occupied (ATK_SOCKET (obj)))
     count = 1;
   dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &count);