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

content/browser/frame_host/frame_accessibility.cc

 // Copyright 2014 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/frame_host/frame_accessibility.h"
 
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_delegate.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/public/browser/browser_context.h"
 
 namespace content {
 
 // static
 FrameAccessibility* FrameAccessibility::GetInstance() {
   return Singleton<FrameAccessibility>::get();
 }
 
 FrameAccessibility::ChildFrameMapping::ChildFrameMapping()
-    : parent_frame_host(NULL),
+    : parent_frame_host(nullptr),
       accessibility_node_id(0),
       child_frame_tree_node_id(0),
       browser_plugin_instance_id(0) {}
 
 FrameAccessibility::FrameAccessibility() {}
 
 FrameAccessibility::~FrameAccessibility() {}
 
 void FrameAccessibility::AddChildFrame(
     RenderFrameHostImpl* parent_frame_host,
@@ skipping 66 matching lines @@
     int accessibility_node_id) {
   for (std::vector<ChildFrameMapping>::iterator iter = mappings_.begin();
        iter != mappings_.end();
        ++iter) {
     if (iter->parent_frame_host != parent_frame_host ||
         iter->accessibility_node_id != accessibility_node_id) {
       continue;
     }
 
     if (iter->child_frame_tree_node_id) {
-      FrameTreeNode* child_node =
-          FrameTree::GloballyFindByID(iter->child_frame_tree_node_id);
-      if (!child_node)
-        return NULL;
-
-      // We should have gotten a node in the same frame tree.
-      if (child_node->frame_tree() !=
-              parent_frame_host->frame_tree_node()->frame_tree()) {
-        NOTREACHED();
-        return NULL;
-      }
-
-      return child_node->current_frame_host();
+      return GetRFHIFromFrameTreeNodeId(
+          parent_frame_host, iter->child_frame_tree_node_id);
     }
 
     if (iter->browser_plugin_instance_id) {
       RenderFrameHost* guest =
           parent_frame_host->delegate()->GetGuestByInstanceID(
               iter->browser_plugin_instance_id);
       if (guest)
         return static_cast<RenderFrameHostImpl*>(guest);
     }
   }
 
-  return NULL;
+  return nullptr;
+}
+
+void FrameAccessibility::GetAllChildFrames(
+    RenderFrameHostImpl* parent_frame_host,
+    std::vector<RenderFrameHostImpl*>* child_frame_hosts) {
+  CHECK(child_frame_hosts);
+
+  for (std::vector<ChildFrameMapping>::iterator iter = mappings_.begin();
+       iter != mappings_.end();
+       ++iter) {
+    if (iter->parent_frame_host != parent_frame_host)
+      continue;
+
+    if (iter->child_frame_tree_node_id) {
+      RenderFrameHostImpl* child_frame_host = GetRFHIFromFrameTreeNodeId(
+          parent_frame_host, iter->child_frame_tree_node_id);
+      if (child_frame_host)
+        child_frame_hosts->push_back(child_frame_host);
+    }
+
+    if (iter->browser_plugin_instance_id) {
+      RenderFrameHost* guest =
+          parent_frame_host->delegate()->GetGuestByInstanceID(
+              iter->browser_plugin_instance_id);
+      if (guest)
+        child_frame_hosts->push_back(static_cast<RenderFrameHostImpl*>(guest));
+    }
+  }
 }
 
 bool FrameAccessibility::GetParent(
     RenderFrameHostImpl* child_frame_host,
     RenderFrameHostImpl** out_parent_frame_host,
     int* out_accessibility_node_id) {
   for (std::vector<ChildFrameMapping>::iterator iter = mappings_.begin();
        iter != mappings_.end();
        ++iter) {
     if (iter->child_frame_tree_node_id) {
       FrameTreeNode* child_node =
           FrameTree::GloballyFindByID(iter->child_frame_tree_node_id);
       if (child_node &&
           child_node->current_frame_host() == child_frame_host) {
         // We should have gotten a node in the same frame tree.

[nasko, 2015/01/16 00:20:33]

Isn't this test now redundant if the two nodes share the same parent, which was
a check added below on 171.

[dmazzoni, 2015/01/16 17:44:55]

Done.

         if (child_node->frame_tree() !=
                 iter->parent_frame_host->frame_tree_node()->frame_tree()) {
           NOTREACHED();
           return false;
         }
 
+        // We should have gotten a *direct* child of the parent frame.
+        if (child_node->parent() !=
+            iter->parent_frame_host->frame_tree_node()) {
+          NOTREACHED();
+          return false;
+        }
+
         if (out_parent_frame_host)
           *out_parent_frame_host = iter->parent_frame_host;
         if (out_accessibility_node_id)
           *out_accessibility_node_id = iter->accessibility_node_id;
         return true;
       }
     }
 
     if (iter->browser_plugin_instance_id) {
       RenderFrameHost* guest =
           iter->parent_frame_host->delegate()->GetGuestByInstanceID(
               iter->browser_plugin_instance_id);
       if (guest == child_frame_host) {
         if (out_parent_frame_host)
           *out_parent_frame_host = iter->parent_frame_host;
         if (out_accessibility_node_id)
           *out_accessibility_node_id = iter->accessibility_node_id;
         return true;
       }
     }
   }
 
   return false;
 }
 
+RenderFrameHostImpl* FrameAccessibility::GetRFHIFromFrameTreeNodeId(
+    RenderFrameHostImpl* parent_frame_host,
+    int64 child_frame_tree_node_id) {
+  FrameTreeNode* child_node =
+      FrameTree::GloballyFindByID(child_frame_tree_node_id);
+  if (!child_node)
+    return nullptr;
+
+  // We should have gotten a node in the same frame tree.
+  if (child_node->frame_tree() !=
+      parent_frame_host->frame_tree_node()->frame_tree()) {
+    NOTREACHED();
+    return nullptr;
+  }
+
+  return child_node->current_frame_host();
+}
+
 }  // namespace content