Make Windows accessibility event firing aware of guest / child frames.

content/browser/accessibility/browser_accessibility_manager.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_manager.h"
 
 #include "base/logging.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/common/accessibility_messages.h"
 #include "ui/accessibility/ax_tree_serializer.h"
@@ skipping 272 matching lines @@
     BrowserAccessibility* active_descendant =
         node->manager()->GetFromID(active_descendant_id);
     if (active_descendant)
       return active_descendant;
   }
   return node;
 }
 
 BrowserAccessibility* BrowserAccessibilityManager::GetFocus(
     BrowserAccessibility* root) {
-  if (focus_ && (!root || focus_->IsDescendantOf(root->node())))
-    return GetFromAXNode(focus_);
+  if (!focus_)
+    return NULL;
 
-  return NULL;
+  if (root && !focus_->IsDescendantOf(root->node()))
+    return NULL;
+
+  if (!delegate())
+    return NULL;
+
+  BrowserAccessibility* obj = GetFromAXNode(focus_);
+  if (obj->HasBoolAttribute(ui::AX_ATTR_IS_AX_TREE_HOST)) {
+    BrowserAccessibilityManager* child_manager =
+        delegate()->AccessibilityGetChildFrame(obj->GetId());
+    if (child_manager)
+      return child_manager->GetFocus(child_manager->GetRoot());
+  }
+
+  return obj;
 }
 
 void BrowserAccessibilityManager::SetFocus(ui::AXNode* node, bool notify) {
   if (focus_ != node)
     focus_ = node;
 
   if (notify && node && delegate_)
     delegate_->AccessibilitySetFocus(node->id());
 }
 
@@ skipping 34 matching lines @@
     const BrowserAccessibility& node,
     int start_offset,
     int end_offset) {
   if (delegate_) {
     delegate_->AccessibilitySetTextSelection(
         node.GetId(), start_offset, end_offset);
   }
 }
 
 gfx::Rect BrowserAccessibilityManager::GetViewBounds() {
-  if (delegate_)
-    return delegate_->AccessibilityGetViewBounds();
+  BrowserAccessibilityDelegate* delegate = GetDelegateFromRootManager();
+  if (delegate)
+    return delegate->AccessibilityGetViewBounds();
   return gfx::Rect();
 }
 
 BrowserAccessibility* BrowserAccessibilityManager::NextInTreeOrder(
     BrowserAccessibility* node) {
   if (!node)
     return NULL;
 
   if (node->PlatformChildCount() > 0)
     return node->PlatformGetChild(0);
@@ skipping 49 matching lines @@
 }
 
 void BrowserAccessibilityManager::OnNodeCreationFinished(ui::AXNode* node) {
   GetFromAXNode(node)->OnUpdateFinished();
 }
 
 void BrowserAccessibilityManager::OnNodeChangeFinished(ui::AXNode* node) {
   GetFromAXNode(node)->OnUpdateFinished();
 }
 
+BrowserAccessibilityDelegate*
+    BrowserAccessibilityManager::GetDelegateFromRootManager() {
+  BrowserAccessibilityManager* manager = this;
+  while (manager->GetRoot()->GetParent())
+    manager = manager->GetRoot()->GetParent()->manager();
+  return manager->delegate();
+}
+
 ui::AXTreeUpdate BrowserAccessibilityManager::SnapshotAXTreeForTesting() {
   scoped_ptr<ui::AXTreeSource<const ui::AXNode*> > tree_source(
       tree_->CreateTreeSource());
   ui::AXTreeSerializer<const ui::AXNode*> serializer(tree_source.get());
   ui::AXTreeUpdate update;
   serializer.SerializeChanges(tree_->GetRoot(), &update);
   return update;
 }
 
 }  // namespace content