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

Side by Side Diff: content/browser/frame_host/render_frame_proxy_host.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: Remove some plumbing that should instead be introduced in the window.focus() CL. Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_frame_proxy_host.h" 5 #include "content/browser/frame_host/render_frame_proxy_host.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "content/browser/bad_message.h" 8 #include "content/browser/bad_message.h"
9 #include "content/browser/frame_host/cross_process_frame_connector.h" 9 #include "content/browser/frame_host/cross_process_frame_connector.h"
10 #include "content/browser/frame_host/frame_tree.h" 10 #include "content/browser/frame_host/frame_tree.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 if (frame_tree_node_->opener()) { 211 if (frame_tree_node_->opener()) {
212 frame_tree_node_->opener()->render_manager()->CreateOpenerProxies( 212 frame_tree_node_->opener()->render_manager()->CreateOpenerProxies(
213 GetSiteInstance(), frame_tree_node_); 213 GetSiteInstance(), frame_tree_node_);
214 } 214 }
215 215
216 int opener_routing_id = 216 int opener_routing_id =
217 frame_tree_node_->render_manager()->GetOpenerRoutingID(GetSiteInstance()); 217 frame_tree_node_->render_manager()->GetOpenerRoutingID(GetSiteInstance());
218 Send(new FrameMsg_UpdateOpener(GetRoutingID(), opener_routing_id)); 218 Send(new FrameMsg_UpdateOpener(GetRoutingID(), opener_routing_id));
219 } 219 }
220 220
221 void RenderFrameProxyHost::SetFocusedFrame() {
222 Send(new FrameMsg_SetFocusedFrame(routing_id_));
223 }
224
221 void RenderFrameProxyHost::OnDetach() { 225 void RenderFrameProxyHost::OnDetach() {
222 if (frame_tree_node_->render_manager()->ForInnerDelegate()) { 226 if (frame_tree_node_->render_manager()->ForInnerDelegate()) {
223 // Only main frame proxy can detach for inner WebContents. 227 // Only main frame proxy can detach for inner WebContents.
224 DCHECK(frame_tree_node_->IsMainFrame()); 228 DCHECK(frame_tree_node_->IsMainFrame());
225 frame_tree_node_->render_manager()->RemoveOuterDelegateFrame(); 229 frame_tree_node_->render_manager()->RemoveOuterDelegateFrame();
226 return; 230 return;
227 } 231 }
228 232
229 // This message should only be received for subframes. Note that we can't 233 // This message should only be received for subframes. Note that we can't
230 // restrict it to just the current SiteInstances of the ancestors of this 234 // restrict it to just the current SiteInstances of the ancestors of this
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params)); 319 new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params));
316 } 320 }
317 } 321 }
318 322
319 void RenderFrameProxyHost::OnDidChangeOpener(int32 opener_routing_id) { 323 void RenderFrameProxyHost::OnDidChangeOpener(int32 opener_routing_id) {
320 frame_tree_node_->render_manager()->DidChangeOpener(opener_routing_id, 324 frame_tree_node_->render_manager()->DidChangeOpener(opener_routing_id,
321 GetSiteInstance()); 325 GetSiteInstance());
322 } 326 }
323 327
324 } // namespace content 328 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698