Refactor BrowserAccessibility to prepare for AXNode (re-land)

content/browser/accessibility/browser_accessibility_gtk.cc

 // Copyright (c) 2012 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 "content/browser/accessibility/browser_accessibility_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility_manager_gtk.h"
@@ skipping 178 matching lines @@
     return NULL;
 
   return obj->GetStringAttribute(
       ui::AX_ATTR_DESCRIPTION).c_str();
 }
 
 static AtkObject* browser_accessibility_get_parent(AtkObject* atk_object) {
   BrowserAccessibilityGtk* obj = ToBrowserAccessibilityGtk(atk_object);
   if (!obj)
     return NULL;
-  if (obj->parent())
-    return obj->parent()->ToBrowserAccessibilityGtk()->GetAtkObject();
+  if (obj->GetParent())
+    return obj->GetParent()->ToBrowserAccessibilityGtk()->GetAtkObject();
 
   BrowserAccessibilityManagerGtk* manager =
       static_cast<BrowserAccessibilityManagerGtk*>(obj->manager());
   return gtk_widget_get_accessible(manager->parent_widget());
 }
 
 static gint browser_accessibility_get_n_children(AtkObject* atk_object) {
   BrowserAccessibilityGtk* obj = ToBrowserAccessibilityGtk(atk_object);
   if (!obj)
     return 0;
 
   return obj->PlatformChildCount();
 }
 
 static AtkObject* browser_accessibility_ref_child(
     AtkObject* atk_object, gint index) {
   BrowserAccessibilityGtk* obj = ToBrowserAccessibilityGtk(atk_object);
   if (!obj)
     return NULL;
 
   if (index < 0 || index >= static_cast<gint>(obj->PlatformChildCount()))
     return NULL;
 
   AtkObject* result =
-      obj->children()[index]->ToBrowserAccessibilityGtk()->GetAtkObject();
+      obj->InternalGetChild(index)->ToBrowserAccessibilityGtk()->GetAtkObject();
   g_object_ref(result);
   return result;
 }
 
 static gint browser_accessibility_get_index_in_parent(AtkObject* atk_object) {
   BrowserAccessibilityGtk* obj = ToBrowserAccessibilityGtk(atk_object);
   if (!obj)
     return 0;
-  return obj->index_in_parent();
+  return obj->GetIndexInParent();
 }
 
 static AtkAttributeSet* browser_accessibility_get_attributes(
     AtkObject* atk_object) {
   return NULL;
 }
 
 static AtkRole browser_accessibility_get_role(AtkObject* atk_object) {
   BrowserAccessibilityGtk* obj = ToBrowserAccessibilityGtk(atk_object);
   if (!obj)
     return ATK_ROLE_INVALID;
   return obj->atk_role();
 }
 
 static AtkStateSet* browser_accessibility_ref_state_set(AtkObject* atk_object) {
   BrowserAccessibilityGtk* obj = ToBrowserAccessibilityGtk(atk_object);
   if (!obj)
     return NULL;
   AtkStateSet* state_set =
       ATK_OBJECT_CLASS(browser_accessibility_parent_class)->
           ref_state_set(atk_object);
-  int32 state = obj->state();
+  int32 state = obj->GetState();
 
   if (state & (1 << ui::AX_STATE_FOCUSABLE))
     atk_state_set_add_state(state_set, ATK_STATE_FOCUSABLE);
   if (obj->manager()->GetFocus(NULL) == obj)
     atk_state_set_add_state(state_set, ATK_STATE_FOCUSED);
   if (state & (1 << ui::AX_STATE_ENABLED))
     atk_state_set_add_state(state_set, ATK_STATE_ENABLED);
 
   return state_set;
 }
@@ skipping 89 matching lines @@
   ATK_TEXT_INTERFACE,
   ATK_VALUE_INTERFACE,
 };
 
 static int GetInterfaceMaskFromObject(BrowserAccessibilityGtk* obj) {
   int interface_mask = 0;
 
   // Component interface is always supported.
   interface_mask |= 1 << ATK_COMPONENT_INTERFACE;
 
-  int role = obj->role();
+  int role = obj->GetRole();
   if (role == ui::AX_ROLE_PROGRESS_INDICATOR ||
       role == ui::AX_ROLE_SCROLL_BAR ||
       role == ui::AX_ROLE_SLIDER) {
     interface_mask |= 1 << ATK_VALUE_INTERFACE;
   }
 
   return interface_mask;
 }
 
 static GType GetAccessibilityTypeFromObject(BrowserAccessibilityGtk* obj) {
@@ skipping 78 matching lines @@
     int interface_mask = GetInterfaceMaskFromObject(this);
     if (interface_mask != interface_mask_) {
       g_object_unref(atk_object_);
       atk_object_ = NULL;
     }
   }
 
   if (!atk_object_) {
     interface_mask_ = GetInterfaceMaskFromObject(this);
     atk_object_ = ATK_OBJECT(browser_accessibility_new(this));
-    if (this->parent()) {
+    if (this->GetParent()) {
       atk_object_set_parent(
           atk_object_,
-          this->parent()->ToBrowserAccessibilityGtk()->GetAtkObject());
+          this->GetParent()->ToBrowserAccessibilityGtk()->GetAtkObject());
     }
   }
 }
 
 bool BrowserAccessibilityGtk::IsNative() const {
   return true;
 }
 
 void BrowserAccessibilityGtk::InitRoleAndState() {
-  switch(role()) {
+  switch(GetRole()) {
     case ui::AX_ROLE_DOCUMENT:
     case ui::AX_ROLE_ROOT_WEB_AREA:
     case ui::AX_ROLE_WEB_AREA:
       atk_role_ = ATK_ROLE_DOCUMENT_WEB;
       break;
     case ui::AX_ROLE_GROUP:
     case ui::AX_ROLE_DIV:
       atk_role_ = ATK_ROLE_SECTION;
       break;
     case ui::AX_ROLE_BUTTON:
@@ skipping 20 matching lines @@
     case ui::AX_ROLE_TEXT_FIELD:
       atk_role_ = ATK_ROLE_ENTRY;
       break;
     default:
       atk_role_ = ATK_ROLE_UNKNOWN;
       break;
   }
 }
 
 }  // namespace content