Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1423053002: Make document.activeElement work with OOPIF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@focus-preserve-page-focus-on-subframe-navigations
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 7868121fa12c7eee2e6fd28858d2fe9caec3c914..b3ab85bce57d5dc84bd3f1adc121173384eaca9f 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -1836,8 +1836,11 @@ void RenderFrameHostImpl::UpdateOpener() {
Send(new FrameMsg_UpdateOpener(GetRoutingID(), opener_routing_id));
}
-void RenderFrameHostImpl::ClearFocus() {
- Send(new FrameMsg_ClearFocus(routing_id_));
+void RenderFrameHostImpl::ClearFocus(FrameTreeNode* focused_ftn) {
+ RenderFrameProxyHost* rfph =
+ focused_ftn->render_manager()->GetRenderFrameProxyHost(GetSiteInstance());
+ int focused_frame_routing_id = rfph ? rfph->GetRoutingID() : MSG_ROUTING_NONE;
+ Send(new FrameMsg_ClearFocus(routing_id_, focused_frame_routing_id));
}
void RenderFrameHostImpl::ExtendSelectionAndDelete(size_t before,

Powered by Google App Engine
This is Rietveld 408576698