Preserve page-level focus for subframe cross-process navigations.

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 <queue>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 411 matching lines @@
 
 void FrameTree::ReplicatePageFocus(bool is_focused) {
   std::set<SiteInstance*> frame_tree_site_instances;
   ForEach(base::Bind(&CollectSiteInstances, &frame_tree_site_instances));
 
   // Send the focus update to main frame's proxies in all SiteInstances of
   // other frames in this FrameTree. Note that the main frame might also know
   // about proxies in SiteInstances for frames in a different FrameTree (e.g.,
   // for window.open), so we can't just iterate over its proxy_hosts_ in
   // RenderFrameHostManager.
-  for (const auto& instance : frame_tree_site_instances) {
-    if (instance == root_->current_frame_host()->GetSiteInstance())
-      continue;
+  for (const auto& instance : frame_tree_site_instances)
+    SetPageFocus(instance, is_focused);
+}
 
+void FrameTree::SetPageFocus(SiteInstance* instance, bool is_focused) {
+  RenderFrameHostManager* root_manager = root_->render_manager();
+
+  // Currently, this is only used to set page-level focus in cross-process

[Charlie Reis, 2015/10/23 21:41:52]

nit: Drop "Currently"

[alexmos, 2015/10/24 00:41:43]

Done.

+  // subframes, and requests to set focus in main frame's SiteInstance are
+  // ignored.
+  if (instance != root_manager->current_frame_host()->GetSiteInstance()) {
     RenderFrameProxyHost* proxy =
-        root_->render_manager()->GetRenderFrameProxyHost(instance);
+        root_manager->GetRenderFrameProxyHost(instance);
     proxy->Send(new InputMsg_SetFocus(proxy->GetRoutingID(), is_focused));
   }
 }
 
 }  // namespace content