Cross-process iframe accessibility.

content/renderer/accessibility/blink_ax_tree_source.cc

Index: content/renderer/accessibility/blink_ax_tree_source.cc
diff --git a/content/renderer/accessibility/blink_ax_tree_source.cc b/content/renderer/accessibility/blink_ax_tree_source.cc
index 55cd82ff6610210654ab6e84d1954c30e4a42ddb..cfc1e94b500e954a7e36b8a43946c4f1bb467185 100644
--- a/content/renderer/accessibility/blink_ax_tree_source.cc
+++ b/content/renderer/accessibility/blink_ax_tree_source.cc
@@ -11,6 +11,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "content/renderer/accessibility/blink_ax_enum_conversion.h"
 #include "content/renderer/render_frame_impl.h"
+#include "content/renderer/render_frame_proxy.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
@@ -112,6 +113,11 @@ bool BlinkAXTreeSource::IsInTree(blink::WebAXObject node) const {
   return false;
 }
 
+void BlinkAXTreeSource::CollectChildFrameIdMapping(
+    std::map<int32, int>* frame_routing_ids) {
+  frame_routing_ids_ = frame_routing_ids;
+}
+
 blink::WebAXObject BlinkAXTreeSource::GetRoot() const {
   return GetMainDocument().accessibilityObject();
 }
@@ -450,6 +456,13 @@ void BlinkAXTreeSource::SerializeNode(blink::WebAXObject src,
     const gfx::Size& max_offset = document.frame()->maximumScrollOffset();
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, max_offset.width());
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, max_offset.height());
+
+    if (frame_routing_ids_ && !src.equals(GetRoot())) {
+      WebFrame* frame = document.frame();
+      RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);

[Charlie Reis, 2014/08/21 19:23:27]

Seems like this would return NULL if frame were a WebRemoteFrame.

[dmazzoni, 2014/08/25 06:49:36]

Agreed. The test was passing only because we were converting the routing_id to a
frame_tree_node_id before the cross-site transition - once we have the
frame_tree_node_id we can follow the frame wherever it goes. We should handle
both cases here, though.

+      frame_routing_ids_->insert(std::pair<int32, int>(
+          dst->id, render_frame->GetRoutingID()));
+    }
   }
 
   if (dst->role == ui::AX_ROLE_TABLE) {
@@ -552,11 +565,8 @@ void BlinkAXTreeSource::SerializeNode(blink::WebAXObject src,
 }
 
 blink::WebDocument BlinkAXTreeSource::GetMainDocument() const {
-  WebView* view = render_frame_->render_view()->GetWebView();
-  WebFrame* main_frame = view ? view->mainFrame() : NULL;
-
-  if (main_frame)
-    return main_frame->document();
+  if (render_frame_ && render_frame_->GetWebFrame())
+    return render_frame_->GetWebFrame()->document();
   return WebDocument();
 }