Enable WebViewAccessiblityTest for OOPIF webview.

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 5aa40a8bbfdd132dc2cd9859266fb29139cef662..232504b30c18a519fdeaf99001d086fc1f39f8e9 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -380,9 +380,10 @@ WebContentsImpl::WebContentsTreeNode::WebContentsTreeNode()
 WebContentsImpl::WebContentsTreeNode::~WebContentsTreeNode() {
   // Remove child pointer from our parent.
   if (outer_web_contents_) {
-    ChildrenSet& child_ptrs_in_parent =
+    ChildrenMap& child_ptrs_in_parent =
         outer_web_contents_->node_->inner_web_contents_tree_nodes_;
-    ChildrenSet::iterator iter = child_ptrs_in_parent.find(this);
+    ChildrenMap::iterator iter =
+        child_ptrs_in_parent.find(outer_contents_frame_tree_node_id_);
     DCHECK(iter != child_ptrs_in_parent.end());
     child_ptrs_in_parent.erase(iter);
   }
@@ -391,11 +392,12 @@ WebContentsImpl::WebContentsTreeNode::~WebContentsTreeNode() {
   // TODO(lazyboy): We should destroy the children WebContentses too. If the
   // children do not manage their own lifetime, then we would leak their
   // WebContentses.
-  for (WebContentsTreeNode* child : inner_web_contents_tree_nodes_)
-    child->outer_web_contents_ = nullptr;
+  for (auto child : inner_web_contents_tree_nodes_)
+    child.second->node_->outer_web_contents_ = nullptr;
 }
 
 void WebContentsImpl::WebContentsTreeNode::ConnectToOuterWebContents(
+    WebContentsImpl* web_contents,
     WebContentsImpl* outer_web_contents,
     RenderFrameHostImpl* outer_contents_frame) {
   DCHECK(!focused_web_contents_) << "Should not attach a root node.";
@@ -410,7 +412,9 @@ void WebContentsImpl::WebContentsTreeNode::ConnectToOuterWebContents(
     outer_web_contents_->node_->SetFocusedWebContents(outer_web_contents_);
   }
 
-  outer_web_contents_->node_->inner_web_contents_tree_nodes_.insert(this);
+  outer_web_contents_->node_
+      ->inner_web_contents_tree_nodes_[outer_contents_frame_tree_node_id_] =
+      web_contents;
 }
 
 void WebContentsImpl::WebContentsTreeNode::SetFocusedWebContents(
@@ -420,6 +424,16 @@ void WebContentsImpl::WebContentsTreeNode::SetFocusedWebContents(
   focused_web_contents_ = web_contents;
 }
 
+WebContentsImpl*
+WebContentsImpl::WebContentsTreeNode::FindInnerWebContentsAtNode(
+    FrameTreeNode* node) {
+  int frame_tree_node_id = node->frame_tree_node_id();
+  auto iter = inner_web_contents_tree_nodes_.find(frame_tree_node_id);

[alexmos, 2017/03/03 20:07:57]

nit: might as well just use "node->frame_tree_node_id()" here and remove the
extra variable, since it isn't used anywhere else, and should still fit on that
line.

[avallee, 2017/06/21 02:25:35]

This is gone after rebase.

+  if (iter == inner_web_contents_tree_nodes_.end())
+    return nullptr;
+  return iter->second;
+}
+
 // WebContentsImpl -------------------------------------------------------------
 
 WebContentsImpl::WebContentsImpl(BrowserContext* browser_context)
@@ -1440,7 +1454,7 @@ void WebContentsImpl::AttachToOuterWebContentsFrame(
   // Create a link to our outer WebContents.
   node_.reset(new WebContentsTreeNode());
   node_->ConnectToOuterWebContents(
-      static_cast<WebContentsImpl*>(outer_web_contents),
+      this, static_cast<WebContentsImpl*>(outer_web_contents),
       static_cast<RenderFrameHostImpl*>(outer_contents_frame));
 
   DCHECK(outer_contents_frame);
@@ -1459,6 +1473,12 @@ void WebContentsImpl::AttachToOuterWebContentsFrame(
       render_manager->GetRenderWidgetHostView())
       ->RegisterFrameSinkId();
 
+  // Set up the the guest's AX tree to point back at the embedder's AX tree.
+  auto* parent_frame = outer_contents_frame->GetParent();
+  GetMainFrame()->set_browser_plugin_embedder_ax_tree_id(
+      parent_frame->GetAXTreeID());
+  GetMainFrame()->UpdateAXTreeData();
+
   // At this point, we should destroy the TextInputManager which will notify all
   // the RWHV in this WebContents. The RWHV in this WebContents should use the
   // TextInputManager owned by the outer WebContents.
@@ -4328,6 +4348,24 @@ WebContentsImpl* WebContentsImpl::GetOutermostWebContents() {
   return root;
 }
 
+void WebContentsImpl::FocusOuterAttachmentFrameChain() {
+  WebContentsImpl* outer_contents = GetOuterWebContents();
+  if (!outer_contents)
+    return;
+
+  FrameTreeNode* outer_node =
+      FrameTreeNode::GloballyFindByID(GetOuterDelegateFrameTreeNodeId());
+  outer_contents->frame_tree_.SetFocusedFrame(outer_node, nullptr);
+
+  // For browser initiated focus change, let embedding renderer know of the
+  // change. In tab navigation can become trapped in the inner contents without

[alexmos, 2017/03/03 20:07:57]

By "In tab navigation" do you just mean "Tab navigation"?  (i.e. pressing
tab/shift-tab?)  But then how is it browser-initiated?

[avallee, 2017/06/21 02:25:35]

Clarified comment.

+  // this.
+  if (GetRenderManager()->GetProxyToOuterDelegate())
+    GetRenderManager()->GetProxyToOuterDelegate()->SetFocusedFrame();
+
+  outer_contents->FocusOuterAttachmentFrameChain();
+}
+
 void WebContentsImpl::RenderViewCreated(RenderViewHost* render_view_host) {
   // Don't send notifications if we are just creating a swapped-out RVH for
   // the opener chain.  These won't be used for view-source or WebUI, so it's
@@ -4732,8 +4770,7 @@ void WebContentsImpl::SetAsFocusedWebContentsIfNecessary() {
   // Make sure the outer web contents knows our frame is focused. Otherwise, the
   // outer renderer could have the element before or after the frame element
   // focused which would return early without actually advancing focus.
-  if (GetRenderManager()->GetProxyToOuterDelegate())
-    GetRenderManager()->GetProxyToOuterDelegate()->SetFocusedFrame();
+  FocusOuterAttachmentFrameChain();
 
   GetMainFrame()->GetRenderWidgetHost()->SetPageFocus(true);
   GetOutermostWebContents()->node_->SetFocusedWebContents(this);
@@ -4748,9 +4785,39 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
     return;
   }
 
-  SetAsFocusedWebContentsIfNecessary();
-
   frame_tree_.SetFocusedFrame(node, source);
+
+  WebContentsImpl* inner_contents = nullptr;
+  if (node_)
+    inner_contents = node_->FindInnerWebContentsAtNode(node);
+
+  WebContentsImpl* contents_to_focus = inner_contents ? inner_contents : this;
+  contents_to_focus->SetAsFocusedWebContentsIfNecessary();
+}
+
+RenderFrameHost* WebContentsImpl::GetFocusedFrameIncludingInnerWebContents() {
+  if (!node_)
+    return GetFocusedFrame();
+
+  WebContentsImpl* contents = this;
+  FrameTreeNode* focused_node = contents->frame_tree_.GetFocusedFrame();
+
+  // If there is no focused frame in the outer WebContents, we need to return
+  // null.
+  if (!focused_node)
+    return nullptr;
+
+  // We cannot return the frame where an inner WebContents is attached, if the

[alexmos, 2017/03/03 20:07:57]

I think this is talking about two different things; let's split this sentence
into two: one about needing to descend into inner WebContents if the focused
frame contains one, another about returning the main frame if the WebContents
doesn't have a focused frame.

[avallee, 2017/06/21 02:25:35]

rephrased.

+  // inner WebContents does not have a focused frame, return its main frame.
+  while (true) {
+    contents = contents->node_->FindInnerWebContentsAtNode(focused_node);
+    if (!contents)
+      return focused_node->current_frame_host();
+
+    focused_node = contents->frame_tree_.GetFocusedFrame();
+    if (!focused_node)
+      return contents->GetMainFrame();
+  }
 }
 
 void WebContentsImpl::OnFocusedElementChangedInFrame(