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

content/browser/frame_host/render_frame_host_manager.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/render_frame_host_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 2143 matching lines @@
   // aren't crossing process boundaries. If so, we just needed to handle the Web
   // UI committing above and we're done.
   if (!pending_render_frame_host_ && !speculative_render_frame_host_) {
     if (will_focus_location_bar)
       delegate_->SetFocusToLocationBar(false);
     return;
   }
 
   // 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();
 
   // Swap in the pending or speculative frame and make it active. Also ensure
   // the FrameTree stays in sync.
   scoped_ptr<RenderFrameHostImpl> old_render_frame_host;
   if (!browser_side_navigation) {
     DCHECK(!speculative_render_frame_host_);
     old_render_frame_host =
         SetRenderFrameHost(pending_render_frame_host_.Pass());
@@ skipping 33 matching lines @@
       old_render_frame_host->render_view_host()->GetWidget()->GetView()) {
     old_render_frame_host->render_view_host()->GetWidget()->GetView()->Hide();
   }
 
   // Make sure the size is up to date.  (Fix for bug 1079768.)
   delegate_->UpdateRenderViewSizeForRenderManager();
 
   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
   // the RFH so that we can clean up RendererResources related to the RFH first.
   delegate_->NotifySwappedFromRenderManager(
       old_render_frame_host.get(), render_frame_host_.get(), is_main_frame);
 
   // The RenderViewHost keeps track of the main RenderFrameHost routing id.
   // If this is committing a main frame navigation, update it and set the
   // routing id in the RenderViewHost associated with the old RenderFrameHost
@@ skipping 419 matching lines @@
 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) {
   if (!frame_tree_node_->opener())
     return MSG_ROUTING_NONE;
 
   return frame_tree_node_->opener()
       ->render_manager()
       ->GetRoutingIdForSiteInstance(instance);
 }
 
 }  // namespace content