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

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 1d36b037795c5cd216fadeb4f67851c11f9e1101..54ff7ba91b7f74a2fadf474645a510a3e9274ed9 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -2161,9 +2161,12 @@ void RenderFrameHostManager::CommitPending() {
 
   // Remember if the page was focused so we can focus the new renderer in
   // that case.
-  bool focus_render_view = !will_focus_location_bar &&
-                           render_frame_host_->GetView() &&
-                           render_frame_host_->GetView()->HasFocus();

[alexmos, 2015/10/22 21:33:40]

For subframes, this routed to RWHVChildFrame, which always returns false for
HasFocus.  I changed this to just ask the root RVHW, which should know correct
page focus.  Alternatively, it might be reasonable to change RWHVCF::HasFocus to
ask the root view (via
CrossProcessFrameConnector::GetRootRenderWidgetHostView?).  Thoughts?

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

That sounds like a better change to me, since anyone who asks RWHVCF (via
GetView) will get the wrong answer today.  Sound good, Ken?

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

I went ahead and did that to see what it'll look like, pending Ken's approval.

+  RenderWidgetHostView* root_view = frame_tree_node_->frame_tree()
+                                        ->root()
+                                        ->render_manager()
+                                        ->GetRenderWidgetHostView();
+  bool focus_render_view =
+      !will_focus_location_bar && root_view && root_view->HasFocus();
 
   bool is_main_frame = frame_tree_node_->IsMainFrame();
 
@@ -2217,7 +2220,14 @@ void RenderFrameHostManager::CommitPending() {
   if (will_focus_location_bar) {
     delegate_->SetFocusToLocationBar(false);
   } else if (focus_render_view && render_frame_host_->GetView()) {
-    render_frame_host_->GetView()->Focus();
+    if (is_main_frame) {
+      render_frame_host_->GetView()->Focus();
+    } else {
+      // The main frame's view is already focused, but we need to set
+      // page-level focus in the subframe's renderer.
+      frame_tree_node_->frame_tree()->SetPageFocus(
+          render_frame_host_->GetSiteInstance(), true);
+    }
   }
 
   // Notify that we've swapped RenderFrameHosts. We do this before shutting down