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 344 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() {
+  BrowserAccessibility* root = GetRoot();

[David Tseng, 2015/01/15 22:33:27]

Would maybe be cleaner to just hold a pointer to BrowserAccessibilityManager and
walk up that way.

[dmazzoni, 2015/01/15 23:09:22]

Done.

+  while (root->GetParent())
+    root = root->GetParent()->manager()->GetRoot();
+  return root->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