Hook up guest browser plugins to the accessibility tree.

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 "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/common/accessibility_messages.h"
 
 namespace content {
 
 #if !defined(OS_MACOSX) && \
     !defined(OS_WIN) && \
     !defined(OS_ANDROID)
 // We have subclassess of BrowserAccessibility on Mac and Win. For any other
 // platform, instantiate the base class.
 // static
 BrowserAccessibility* BrowserAccessibility::Create() {
   return new BrowserAccessibility();
 }
 #endif
 
 BrowserAccessibility::BrowserAccessibility()
     : manager_(NULL),
-      node_(NULL),
-      child_frame_tree_node_id_(0) {
+      node_(NULL) {
 }
 
 BrowserAccessibility::~BrowserAccessibility() {
 }
 
 void BrowserAccessibility::Init(BrowserAccessibilityManager* manager,
     ui::AXNode* node) {
   manager_ = manager;
   node_ = node;
 }
@@ skipping 16 matching lines @@
     case ui::AX_ROLE_STATIC_TEXT:
     case ui::AX_ROLE_TEXT_AREA:
     case ui::AX_ROLE_TEXT_FIELD:
       return true;
     default:
       return false;
   }
 }
 
 uint32 BrowserAccessibility::PlatformChildCount() const {
-  if (child_frame_tree_node_id_ &&
-      manager_ && manager_->delegate()) {
-    BrowserAccessibilityManager* child_manager =
-        manager_->delegate()->AccessibilityGetChildFrame(
-            child_frame_tree_node_id_);
-    if (child_manager)
-      return 1;
-  }
-
   return PlatformIsLeaf() ? 0 : InternalChildCount();
 }
 
 bool BrowserAccessibility::IsNative() const {
   return false;
 }
 
 bool BrowserAccessibility::IsDescendantOf(
     BrowserAccessibility* ancestor) {
   if (this == ancestor) {
     return true;
   } else if (GetParent()) {
     return GetParent()->IsDescendantOf(ancestor);
   }
 
   return false;
 }
 
 BrowserAccessibility* BrowserAccessibility::PlatformGetChild(
     uint32 child_index) const {
-  if (child_index == 0 && child_frame_tree_node_id_ &&
-      manager_ &&
-      manager_->delegate()) {
+  DCHECK(child_index < InternalChildCount());
+  BrowserAccessibility* result = InternalGetChild(child_index);
+
+  if (result->HasBoolAttribute(ui::AX_ATTR_IS_AX_TREE_HOST)) {
     BrowserAccessibilityManager* child_manager =
-        manager_->delegate()->AccessibilityGetChildFrame(
-            child_frame_tree_node_id_);
+        manager_->delegate()->AccessibilityGetChildFrame(result->GetId());
     if (child_manager)
-      return child_manager->GetRoot();
+      result = child_manager->GetRoot();
   }
 
-  DCHECK(child_index < InternalChildCount());
-  return InternalGetChild(child_index);
+  return result;
 }
 
 BrowserAccessibility* BrowserAccessibility::GetPreviousSibling() {
   if (GetParent() && GetIndexInParent() > 0)
     return GetParent()->InternalGetChild(GetIndexInParent() - 1);
 
   return NULL;
 }
 
 BrowserAccessibility* BrowserAccessibility::GetNextSibling() {
@@ skipping 19 matching lines @@
     return NULL;
   return manager_->GetFromAXNode(node_->children()[child_index]);
 }
 
 BrowserAccessibility* BrowserAccessibility::GetParent() const {
   if (!node_ || !manager_)
     return NULL;
   ui::AXNode* parent = node_->parent();
   if (parent)
     return manager_->GetFromAXNode(parent);
-  return manager_->GetCrossFrameParent();
+
+  if (!manager_->delegate())
+    return NULL;
+
+  BrowserAccessibility* host_node =
+      manager_->delegate()->AccessibilityGetParentFrame();
+  if (!host_node)
+    return NULL;
+
+  return host_node->GetParent();
 }
 
 int32 BrowserAccessibility::GetIndexInParent() const {
   return node_ ? node_->index_in_parent() : -1;
 }
 
 int32 BrowserAccessibility::GetId() const {
   return node_ ? node_->id() : -1;
 }
 
@@ skipping 537 matching lines @@
 int BrowserAccessibility::GetStaticTextLenRecursive() const {
   if (GetRole() == ui::AX_ROLE_STATIC_TEXT)
     return static_cast<int>(GetStringAttribute(ui::AX_ATTR_VALUE).size());
 
   int len = 0;
   for (size_t i = 0; i < InternalChildCount(); ++i)
     len += InternalGetChild(i)->GetStaticTextLenRecursive();
   return len;
 }
 
-void BrowserAccessibility::SetChildFrameTreeNodeId(
-    int64 child_frame_tree_node_id) {
-  child_frame_tree_node_id_ = child_frame_tree_node_id;
-  manager_->NotifyAccessibilityEvent(ui::AX_EVENT_CHILDREN_CHANGED, this);
-}
-
 }  // namespace content