Implementing ATK functions get_index_in_parent & ref_relation_set for Chrome UI

ui/accessibility/platform/ax_platform_node_auralinux.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/accessibility/platform/ax_platform_node_auralinux.h"
 
 #include "base/command_line.h"
 #include "base/strings/sys_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/platform/atk_util_auralinux.h"
@@ skipping 68 matching lines @@
     AtkObject* atk_object) {
   ui::AXPlatformNodeAuraLinux* obj =
       AtkObjectToAXPlatformNodeAuraLinux(atk_object);
   if (!obj)
     return nullptr;
 
   return obj->GetStringAttribute(
       ui::AX_ATTR_DESCRIPTION).c_str();
 }
 
+static gint ax_platform_node_auralinux_get_index_in_parent(
+    AtkObject* atk_object) {
+

[dmazzoni, 2015/03/23 22:19:57]

nit: get rid of this blank line at the beginning of the function

+  ui::AXPlatformNodeAuraLinux* obj =
+    AtkObjectToAXPlatformNodeAuraLinux(atk_object);
+
+  if (!obj || !obj->GetParent())
+    return -1;
+
+  AtkObject* obj_parent = obj->GetParent();
+
+  unsigned child_count = atk_object_get_n_accessible_children(obj_parent);
+  for (unsigned index = 0; index < child_count; index++) {
+    AtkObject* child = atk_object_ref_accessible_child(obj_parent, index);
+    bool atk_object_found = (child == atk_object)?true:false;

[dmazzoni, 2015/03/23 22:19:57]

nit: git rid of "?true:false", it's not needed

+    g_object_unref(child);

[dmazzoni, 2015/03/23 22:19:57]

in a separate changelist, could you look into the possibility of writing a
wrapper class like scoped_gobject? (similar to ScopedComPtr or scoped_ptr).

+    if (atk_object_found)
+      return index;
+  }
+
+  return obj->GetIndexInParent();
+}
+
 static AtkObject* ax_platform_node_auralinux_get_parent(AtkObject* atk_object) {
   ui::AXPlatformNodeAuraLinux* obj =
       AtkObjectToAXPlatformNodeAuraLinux(atk_object);
   if (!obj)
     return nullptr;
 
   return obj->GetParent();
 }
 
 static gint ax_platform_node_auralinux_get_n_children(AtkObject* atk_object) {
@@ skipping 11 matching lines @@
       AtkObjectToAXPlatformNodeAuraLinux(atk_object);
   if (!obj)
     return nullptr;
 
   AtkObject* result = obj->ChildAtIndex(index);
   if (result)
     g_object_ref(result);
   return result;
 }
 
+static AtkRelationSet* ax_platform_node_auralinux_ref_relation_set(
+    AtkObject* atk_object) {
+  ui::AXPlatformNodeAuraLinux* obj =
+      AtkObjectToAXPlatformNodeAuraLinux(atk_object);
+  AtkRelationSet* atk_relation_set =
+      ATK_OBJECT_CLASS(ax_platform_node_auralinux_parent_class)->
+      ref_relation_set(atk_object);
+
+  if (!obj)
+    return atk_relation_set;
+
+  obj->GetAtkRelation(atk_relation_set);
+  return atk_relation_set;
+}
+
 static AtkRole ax_platform_node_auralinux_get_role(AtkObject* atk_object) {
   ui::AXPlatformNodeAuraLinux* obj =
       AtkObjectToAXPlatformNodeAuraLinux(atk_object);
   if (!obj)
     return ATK_ROLE_INVALID;
   return obj->GetAtkRole();
 }
 
 static AtkStateSet* ax_platform_node_auralinux_ref_state_set(
     AtkObject* atk_object) {
@@ skipping 38 matching lines @@
 
   gobject_class->finalize = ax_platform_node_auralinux_finalize;
   klass->initialize = ax_platform_node_auralinux_init;
   klass->get_name = ax_platform_node_auralinux_get_name;
   klass->get_description = ax_platform_node_auralinux_get_description;
   klass->get_parent = ax_platform_node_auralinux_get_parent;
   klass->get_n_children = ax_platform_node_auralinux_get_n_children;
   klass->ref_child = ax_platform_node_auralinux_ref_child;
   klass->get_role = ax_platform_node_auralinux_get_role;
   klass->ref_state_set = ax_platform_node_auralinux_ref_state_set;
+  klass->get_index_in_parent = ax_platform_node_auralinux_get_index_in_parent;
+  klass->ref_relation_set = ax_platform_node_auralinux_ref_relation_set;
 }
 
 GType ax_platform_node_auralinux_get_type() {
   static volatile gsize type_volatile = 0;
 
   if (g_once_init_enter(&type_volatile)) {
     static const GTypeInfo tinfo = {
       sizeof(AXPlatformNodeAuraLinuxClass),
       (GBaseInitFunc) 0,
       (GBaseFinalizeFunc) 0,
@@ skipping 120 matching lines @@
   if (state & (1 << ui::AX_STATE_FOCUSED))
     atk_state_set_add_state(state_set, ATK_STATE_FOCUSED);
   if (state & (1 << ui::AX_STATE_PRESSED))
     atk_state_set_add_state(state_set, ATK_STATE_PRESSED);
   if (state & (1 << ui::AX_STATE_SELECTABLE))
     atk_state_set_add_state(state_set, ATK_STATE_SELECTABLE);
   if (state & (1 << ui::AX_STATE_SELECTED))
     atk_state_set_add_state(state_set, ATK_STATE_SELECTED);
 }
 
+void AXPlatformNodeAuraLinux::GetAtkRelation(AtkRelationSet* atk_relation_set) {
+  return;

[dmazzoni, 2015/03/23 22:19:57]

nit: no "return", just leave it blank.

+}
+
 AXPlatformNodeAuraLinux::AXPlatformNodeAuraLinux()
     : atk_object_(nullptr) {
 }
 
 AXPlatformNodeAuraLinux::~AXPlatformNodeAuraLinux() {
   g_object_unref(atk_object_);
 }
 
 void AXPlatformNodeAuraLinux::Init(AXPlatformNodeDelegate* delegate) {
   // Initialize ATK.
@@ skipping 11 matching lines @@
 }
 
 void AXPlatformNodeAuraLinux::NotifyAccessibilityEvent(ui::AXEvent event_type) {
 }
 
 int AXPlatformNodeAuraLinux::GetIndexInParent() {
   return 0;
 }
 
 }  // namespace ui