Rename BrowserAccessibility::GetParent to PlatformGetParent.

content/browser/accessibility/browser_accessibility.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.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 81 matching lines @@
     default:
       return false;
   }
 }
 
 uint32_t BrowserAccessibility::PlatformChildCount() const {
   if (HasIntAttribute(ui::AX_ATTR_CHILD_TREE_ID)) {
     BrowserAccessibilityManager* child_manager =
         BrowserAccessibilityManager::FromID(
             GetIntAttribute(ui::AX_ATTR_CHILD_TREE_ID));
-    if (child_manager && child_manager->GetRoot()->GetParent() == this)
+    if (child_manager &&
+        child_manager->GetRoot()->GetAccessibilityParent() == this)
       return 1;
 
     return 0;
   }
 
   return PlatformIsLeaf() ? 0 : InternalChildCount();
 }
 
 bool BrowserAccessibility::IsNative() const {
   return false;
 }
 
 bool BrowserAccessibility::IsDescendantOf(
     const BrowserAccessibility* ancestor) const {
   if (!ancestor)
     return false;
 
   if (this == ancestor)
     return true;
 
-  if (GetParent())
-    return GetParent()->IsDescendantOf(ancestor);
+  if (GetAccessibilityParent())
+    return GetAccessibilityParent()->IsDescendantOf(ancestor);
 
   return false;
 }
 
 bool BrowserAccessibility::IsTextOnlyObject() const {
   return GetRole() == ui::AX_ROLE_STATIC_TEXT ||
          GetRole() == ui::AX_ROLE_LINE_BREAK ||
          GetRole() == ui::AX_ROLE_INLINE_TEXT_BOX;
 }
 
 bool BrowserAccessibility::IsLineBreakObject() const {
   return GetRole() == ui::AX_ROLE_LINE_BREAK ||
-         (IsTextOnlyObject() && GetParent() &&
-          GetParent()->GetRole() == ui::AX_ROLE_LINE_BREAK);
+         (IsTextOnlyObject() && GetAccessibilityParent() &&
+          GetAccessibilityParent()->GetRole() == ui::AX_ROLE_LINE_BREAK);
 }
 
 BrowserAccessibility* BrowserAccessibility::PlatformGetChild(
     uint32_t child_index) const {
   BrowserAccessibility* result = nullptr;
 
   if (child_index == 0 && HasIntAttribute(ui::AX_ATTR_CHILD_TREE_ID)) {
     BrowserAccessibilityManager* child_manager =
         BrowserAccessibilityManager::FromID(
             GetIntAttribute(ui::AX_ATTR_CHILD_TREE_ID));
-    if (child_manager && child_manager->GetRoot()->GetParent() == this)
+    if (child_manager &&
+        child_manager->GetRoot()->GetAccessibilityParent() == this)
       result = child_manager->GetRoot();
   } else {
     result = InternalGetChild(child_index);
   }
 
   return result;
 }
 
 bool BrowserAccessibility::PlatformIsChildOfLeaf() const {
   BrowserAccessibility* ancestor = InternalGetParent();
@@ skipping 10 matching lines @@
   BrowserAccessibility* platform_object =
       const_cast<BrowserAccessibility*>(this);
   while (platform_object && platform_object->PlatformIsChildOfLeaf())
     platform_object = platform_object->InternalGetParent();
 
   DCHECK(platform_object);
   return platform_object;
 }
 
 BrowserAccessibility* BrowserAccessibility::GetPreviousSibling() const {
-  if (GetParent() && GetIndexInParent() > 0)
-    return GetParent()->InternalGetChild(GetIndexInParent() - 1);
+  if (GetAccessibilityParent() && GetIndexInParent() > 0)

[dmazzoni, 2017/03/21 16:42:20]

This actually brings up an interesting question - since this uses
InternalGetChild, should we be using InternalGetParent here?
Or switch them all to Platform equivalents?

Looking at how these are used, these should probably all call the
Platform equivalents.

Sorry - even simple refactorings often uncover more subtle issues.

+    return GetAccessibilityParent()->InternalGetChild(GetIndexInParent() - 1);
 
   return nullptr;
 }
 
 BrowserAccessibility* BrowserAccessibility::GetNextSibling() const {
-  if (GetParent() &&
-      GetIndexInParent() >= 0 &&
-      GetIndexInParent() < static_cast<int>(
-          GetParent()->InternalChildCount() - 1)) {
-    return GetParent()->InternalGetChild(GetIndexInParent() + 1);
+  if (GetAccessibilityParent() && GetIndexInParent() >= 0 &&
+      GetIndexInParent() <
+          static_cast<int>(GetAccessibilityParent()->InternalChildCount() -
+                           1)) {
+    return GetAccessibilityParent()->InternalGetChild(GetIndexInParent() + 1);
   }
 
   return nullptr;
 }
 
 bool BrowserAccessibility::IsPreviousSiblingOnSameLine() const {
   const BrowserAccessibility* previous_sibling = GetPreviousSibling();
   if (!previous_sibling)
     return false;
 
@@ skipping 98 matching lines @@
 BrowserAccessibility* BrowserAccessibility::InternalGetChild(
     uint32_t child_index) const {
   if (!node_ || !manager_ || child_index >= InternalChildCount())
     return nullptr;
 
   auto* child_node = node_->ChildAtIndex(child_index);
   DCHECK(child_node);
   return manager_->GetFromAXNode(child_node);
 }
 
-BrowserAccessibility* BrowserAccessibility::GetParent() const {
+BrowserAccessibility* BrowserAccessibility::GetAccessibilityParent() const {
   if (!instance_active())
     return nullptr;
 
   ui::AXNode* parent = node_->parent();
   if (parent)
     return manager_->GetFromAXNode(parent);
 
   return manager_->GetParentNodeFromParentTree();
 }
 
@@ skipping 500 matching lines @@
   return GetData().GetFloatAttribute(attribute, value);
 }
 
 bool BrowserAccessibility::HasInheritedStringAttribute(
     ui::AXStringAttribute attribute) const {
   if (!instance_active())
     return false;
 
   if (GetData().HasStringAttribute(attribute))
     return true;
-  return GetParent() && GetParent()->HasInheritedStringAttribute(attribute);
+  return GetAccessibilityParent() &&
+         GetAccessibilityParent()->HasInheritedStringAttribute(attribute);
 }
 
 const std::string& BrowserAccessibility::GetInheritedStringAttribute(
     ui::AXStringAttribute attribute) const {
   if (!instance_active())
     return base::EmptyString();
 
   const BrowserAccessibility* current_object = this;
   do {
     if (current_object->GetData().HasStringAttribute(attribute))
       return current_object->GetData().GetStringAttribute(attribute);
-    current_object = current_object->GetParent();
+    current_object = current_object->GetAccessibilityParent();
   } while (current_object);
   return base::EmptyString();
 }
 
 bool BrowserAccessibility::GetInheritedStringAttribute(
     ui::AXStringAttribute attribute,
     std::string* value) const {
   if (!instance_active()) {
     *value = std::string();
     return false;
   }
 
   if (GetData().GetStringAttribute(attribute, value))
     return true;
-  return GetParent() &&
-         GetParent()->GetData().GetStringAttribute(attribute, value);
+  return GetAccessibilityParent() &&
+         GetAccessibilityParent()->GetData().GetStringAttribute(attribute,
+                                                                value);
 }
 
 base::string16 BrowserAccessibility::GetInheritedString16Attribute(
     ui::AXStringAttribute attribute) const {
   if (!instance_active())
     return base::string16();
 
   const BrowserAccessibility* current_object = this;
   do {
     if (current_object->GetData().HasStringAttribute(attribute))
       return current_object->GetData().GetString16Attribute(attribute);
-    current_object = current_object->GetParent();
+    current_object = current_object->GetAccessibilityParent();
   } while (current_object);
   return base::string16();
 }
 
 bool BrowserAccessibility::GetInheritedString16Attribute(
     ui::AXStringAttribute attribute,
     base::string16* value) const {
   if (!instance_active()) {
     *value = base::string16();
     return false;
   }
 
   if (GetData().GetString16Attribute(attribute, value))
     return true;
-  return GetParent() &&
-         GetParent()->GetData().GetString16Attribute(attribute, value);
+  return GetAccessibilityParent() &&
+         GetAccessibilityParent()->GetData().GetString16Attribute(attribute,
+                                                                  value);
 }
 
 bool BrowserAccessibility::HasIntAttribute(
     ui::AXIntAttribute attribute) const {
   return GetData().HasIntAttribute(attribute);
 }
 
 int BrowserAccessibility::GetIntAttribute(ui::AXIntAttribute attribute) const {
   return GetData().GetIntAttribute(attribute);
 }
@@ skipping 113 matching lines @@
 
   return focus_object->IsDescendantOf(this);
 }
 
 bool BrowserAccessibility::IsWebAreaForPresentationalIframe() const {
   if (GetRole() != ui::AX_ROLE_WEB_AREA &&
       GetRole() != ui::AX_ROLE_ROOT_WEB_AREA) {
     return false;
   }
 
-  BrowserAccessibility* parent = GetParent();
+  BrowserAccessibility* parent = GetAccessibilityParent();
   if (!parent)
     return false;
 
   return parent->GetRole() == ui::AX_ROLE_IFRAME_PRESENTATIONAL;
 }
 
 bool BrowserAccessibility::IsClickable() const {
   return ui::IsRoleClickable(GetRole());
 }
 
@@ skipping 70 matching lines @@
     case ui::AX_ROLE_TEXT_FIELD:
       return !HasState(ui::AX_STATE_RICHLY_EDITABLE);
     default:
       return false;
   }
 }
 
 // Indicates if this object is at the root of a rich edit text control.
 bool BrowserAccessibility::IsRichTextControl() const {
   return HasState(ui::AX_STATE_RICHLY_EDITABLE) &&
-         (!GetParent() || !GetParent()->HasState(ui::AX_STATE_RICHLY_EDITABLE));
+         (!GetAccessibilityParent() ||
+          !GetAccessibilityParent()->HasState(ui::AX_STATE_RICHLY_EDITABLE));
 }
 
 std::string BrowserAccessibility::ComputeAccessibleNameFromDescendants() {
   std::string name;
   for (size_t i = 0; i < InternalChildCount(); ++i) {
     BrowserAccessibility* child = InternalGetChild(i);
     std::string child_name;
     if (child->GetStringAttribute(ui::AX_ATTR_NAME, &child_name)) {
       if (!name.empty())
         name += " ";
@@ skipping 64 matching lines @@
     bool frame_only) const {
   const BrowserAccessibility* node = this;
   while (node) {
     if (node->GetData().transform)
       node->GetData().transform->TransformRect(&bounds);
 
     const BrowserAccessibility* container =
         node->manager()->GetFromID(node->GetData().offset_container_id);
     if (!container) {
       if (node == node->manager()->GetRoot() && !frame_only) {
-        container = node->GetParent();
+        container = node->GetAccessibilityParent();
       } else {
         container = node->manager()->GetRoot();
       }
     }
 
     if (!container || container == node)
       break;
 
     gfx::RectF container_bounds = container->GetLocation();
     bounds.Offset(container_bounds.x(), container_bounds.y());
 
     if (container->manager()->UseRootScrollOffsetsWhenComputingBounds() ||
-        container->GetParent()) {
+        container->GetAccessibilityParent()) {
       int sx = 0;
       int sy = 0;
       if (container->GetIntAttribute(ui::AX_ATTR_SCROLL_X, &sx) &&
           container->GetIntAttribute(ui::AX_ATTR_SCROLL_Y, &sy)) {
         bounds.Offset(-sx, -sy);
       }
     }
 
     node = container;
   }
 
   return gfx::ToEnclosingRect(bounds);
 }
 
 }  // namespace content