One accessibility tree per frame.

content/renderer/accessibility/blink_ax_tree_source.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/renderer/accessibility/blink_ax_tree_source.h"
 
 #include <stddef.h>
 
 #include <set>
 
@@ skipping 144 matching lines @@
   if (!anchor_object.isNull() && !focus_object.isNull() &&
       anchor_offset >= 0 && focus_offset >= 0) {
     int32_t anchor_id = anchor_object.axID();
     int32_t focus_id = focus_object.axID();
     tree_data.sel_anchor_object_id = anchor_id;
     tree_data.sel_anchor_offset = anchor_offset;
     tree_data.sel_focus_object_id = focus_id;
     tree_data.sel_focus_offset = focus_offset;
   }
 
-  // Get the tree ID for this frame and possibly the parent frame.
+  // Get the tree ID for this frame the parent frame.

[David Tseng, 2016/03/04 16:50:21]

nit remove: the parent frame

[dmazzoni, 2016/03/07 21:35:32]

Changed to "and the parent frame", which is what I meant.

   WebLocalFrame* web_frame = document.frame();
   if (web_frame) {
     RenderFrame* render_frame = RenderFrame::FromWebFrame(web_frame);
     tree_data.routing_id = render_frame->GetRoutingID();
 
-    // Get the tree ID for the parent frame, if it's remote.
-    // (If it's local, it's already part of this same tree.)
+    // Get the tree ID for the parent frame.
     blink::WebFrame* parent_web_frame = web_frame->parent();
     if (parent_web_frame && parent_web_frame->isWebRemoteFrame()) {
       RenderFrameProxy* parent_render_frame_proxy =
           RenderFrameProxy::FromWebFrame(parent_web_frame);
       tree_data.parent_routing_id = parent_render_frame_proxy->routing_id();
+    } else if (parent_web_frame && parent_web_frame->isWebLocalFrame()) {
+      RenderFrame* parent_render_frame = RenderFrame::FromWebFrame(
+          parent_web_frame);
+      tree_data.parent_routing_id = parent_render_frame->GetRoutingID();
     }
   }
 
   return tree_data;
 }
 
 blink::WebAXObject BlinkAXTreeSource::GetRoot() const {
   if (!root_.isNull())
     return root_;
   return GetMainDocument().accessibilityObject();
@@ skipping 270 matching lines @@
     }
 
     // Browser plugin (used in a <webview>).
     BrowserPlugin* browser_plugin = BrowserPlugin::GetFromNode(element);
     if (browser_plugin) {
       dst->AddContentIntAttribute(
           AX_CONTENT_ATTR_CHILD_BROWSER_PLUGIN_INSTANCE_ID,
           browser_plugin->browser_plugin_instance_id());
     }
 
-    // Out-of-process iframe.
+    // Iframe.
     if (is_iframe) {
       WebFrame* frame = WebFrame::fromFrameOwnerElement(element);
-
       if (frame && frame->isWebRemoteFrame()) {
         RenderFrameProxy* render_frame_proxy =
             RenderFrameProxy::FromWebFrame(frame);
         DCHECK(render_frame_proxy);
         dst->AddContentIntAttribute(
             AX_CONTENT_ATTR_CHILD_ROUTING_ID,
             render_frame_proxy->routing_id());
+      } else if (frame && frame->isWebLocalFrame()) {
+        RenderFrame* render_frame = RenderFrame::FromWebFrame(frame);
+        DCHECK(render_frame);
+        dst->AddContentIntAttribute(
+            AX_CONTENT_ATTR_CHILD_ROUTING_ID,
+            render_frame->GetRoutingID());
       }
     }
   }
 
   if (src.isInLiveRegion()) {
     dst->AddBoolAttribute(ui::AX_ATTR_LIVE_ATOMIC, src.liveRegionAtomic());
     dst->AddBoolAttribute(ui::AX_ATTR_LIVE_BUSY, src.liveRegionBusy());
     if (src.liveRegionBusy())
       dst->state |= (1 << ui::AX_STATE_BUSY);
     if (!src.liveRegionStatus().isEmpty()) {
@@ skipping 132 matching lines @@
   }
 }
 
 blink::WebDocument BlinkAXTreeSource::GetMainDocument() const {
   if (render_frame_ && render_frame_->GetWebFrame())
     return render_frame_->GetWebFrame()->document();
   return WebDocument();
 }
 
 }  // namespace content