Fix keyboard focus for OOPIF-<webview>.

content/browser/frame_host/frame_tree.cc

 // Copyright 2013 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_tree.h"
 
 #include <stddef.h>
 
 #include <queue>
 #include <utility>
@@ skipping 233 matching lines @@
 }
 
 FrameTreeNode* FrameTree::GetFocusedFrame() {
   return FindByID(focused_frame_tree_node_id_);
 }
 
 void FrameTree::SetFocusedFrame(FrameTreeNode* node, SiteInstance* source) {
   if (node == GetFocusedFrame())
     return;
 
+  if (node == nullptr) {
+    if (GetFocusedFrame()) {

[lfg, 2016/05/06 21:23:33]

Nit: no need for {}.

[avallee, 2016/05/11 18:26:11]

Done.

+      GetFocusedFrame()->current_frame_host()->UnsetFocusedFrame();
+    }
+    focused_frame_tree_node_id_ = FrameTreeNode::kFrameTreeNodeInvalidId;
+    // FIXME: Do we need to update the AX tree here?

[lfg, 2016/05/06 21:23:33]

Check with dmazzoni@ if this is necessary.

[dmazzoni, 2016/05/09 17:07:20]

Yes, it'd be good to add this line (just like is done at the bottom of this
function):

root()->current_frame_host()->UpdateAXTreeData();

[avallee, 2016/05/11 18:26:11]

Sent email.

[avallee, 2016/05/11 18:26:11]

This doesn't seem to make the test pass. I've filed a bug.

+    return;
+  }
+
   std::set<SiteInstance*> frame_tree_site_instances =
       CollectSiteInstances(this);
 
   SiteInstance* current_instance =
       node->current_frame_host()->GetSiteInstance();
 
   // Update the focused frame in all other SiteInstances.  If focus changes to
   // a cross-process frame, this allows the old focused frame's renderer
   // process to clear focus from that frame and fire blur events.  It also
   // ensures that the latest focused frame is available in all renderers to
   // compute document.activeElement.
   //
   // We do not notify the |source| SiteInstance because it already knows the
   // new focused frame (since it initiated the focus change), and we notify the
   // new focused frame's SiteInstance (if it differs from |source|) separately
   // below.
   for (const auto& instance : frame_tree_site_instances) {
     if (instance != source && instance != current_instance) {
       DCHECK(SiteIsolationPolicy::AreCrossProcessFramesPossible());
       RenderFrameProxyHost* proxy =
           node->render_manager()->GetRenderFrameProxyHost(instance);
-      proxy->SetFocusedFrame();
+      if (proxy) {

[lfg, 2016/05/06 21:23:32]

nit: {}

[avallee, 2016/05/11 18:26:11]

Done.

+        proxy->SetFocusedFrame();
+      }
     }
   }
 
   // If |node| was focused from a cross-process frame (i.e., via
   // window.focus()), tell its RenderFrame that it should focus.
-  if (current_instance != source)
+  if (current_instance && current_instance != source)
     node->current_frame_host()->SetFocusedFrame();
 
   focused_frame_tree_node_id_ = node->frame_tree_node_id();
   node->DidFocus();
 
   // The accessibility tree data for the root of the frame tree keeps
   // track of the focused frame too, so update that every time the
   // focused frame changes.
   root()->current_frame_host()->UpdateAXTreeData();
 }
@@ skipping 134 matching lines @@
   // This is only used to set page-level focus in cross-process subframes, and
   // requests to set focus in main frame's SiteInstance are ignored.
   if (instance != root_manager->current_frame_host()->GetSiteInstance()) {
     RenderFrameProxyHost* proxy =
         root_manager->GetRenderFrameProxyHost(instance);
     proxy->Send(new InputMsg_SetFocus(proxy->GetRoutingID(), is_focused));
   }
 }
 
 }  // namespace content