Cross-process iframe accessibility.

content/browser/frame_host/render_frame_proxy_host.cc

Index: content/browser/frame_host/render_frame_proxy_host.cc
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index 22d5bb75831c7035f283f9ccfdfbd50f6b2914ee..f8e6839118966b18465a977b91983b0cd24cf2e1 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/frame_host/render_frame_proxy_host.h"
 
+#include "base/lazy_instance.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
@@ -13,16 +14,30 @@
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/frame_messages.h"
+#include "content/public/browser/browser_thread.h"
 #include "ipc/ipc_message.h"
 
 namespace content {
 
+namespace {
+
+// The (process id, routing id) pair that identifies one RenderFrame.
+typedef std::pair<int32, int32> RenderFrameProxyHostID;
+typedef base::hash_map<RenderFrameProxyHostID, RenderFrameProxyHost*>
+    RoutingIDFrameProxyMap;
+base::LazyInstance<RoutingIDFrameProxyMap> g_routing_id_frame_proxy_map =
+  LAZY_INSTANCE_INITIALIZER;
+
+}
+
 RenderFrameProxyHost::RenderFrameProxyHost(SiteInstance* site_instance,
                                            FrameTreeNode* frame_tree_node)
     : routing_id_(site_instance->GetProcess()->GetNextRoutingID()),
       site_instance_(site_instance),
       frame_tree_node_(frame_tree_node) {
   GetProcess()->AddRoute(routing_id_, this);
+  g_routing_id_frame_proxy_map.Get().insert(std::make_pair(

[nasko, 2014/08/25 21:23:29]

nit: I like checking the return value of insert, just to make sure we don't have
any bugs creep up on us.

[dmazzoni, 2014/08/26 23:31:03]

Is this what you had in mind?

  DCHECK(g_routing_id_frame_proxy_map.Get().insert(
      std::make_pair(
          RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_),
          this)).second);

[Charlie Reis, 2014/08/27 17:28:34]

You'll need to store the return value and DCHECK(result.second), since the
bodies of DCHECKs get compiled out.  For example:
https://code.google.com/p/chromium/codesearch#chromium/src/content/browser/fr...

+      RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_), this));
 
   if (!frame_tree_node_->IsMainFrame() &&
       frame_tree_node_->parent()
@@ -45,6 +60,8 @@ RenderFrameProxyHost::~RenderFrameProxyHost() {
     Send(new FrameMsg_DeleteProxy(routing_id_));
 
   GetProcess()->RemoveRoute(routing_id_);
+  g_routing_id_frame_proxy_map.Get().erase(
+      RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_));
 }
 
 void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) {
@@ -110,4 +127,14 @@ bool RenderFrameProxyHost::InitRenderFrameProxy() {
   return true;
 }
 
+// static
+RenderFrameProxyHost* RenderFrameProxyHost::FromID(int process_id,

[nasko, 2014/08/25 21:23:29]

nit: static methods should be at the top of the file

[dmazzoni, 2014/08/26 23:31:03]

Done.

+                                                   int routing_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  RoutingIDFrameProxyMap* frames = g_routing_id_frame_proxy_map.Pointer();
+  RoutingIDFrameProxyMap::iterator it = frames->find(
+      RenderFrameProxyHostID(process_id, routing_id));
+  return it == frames->end() ? NULL : it->second;
+}
+
 }  // namespace content