Chromium Code Reviews| Index: content/renderer/render_frame_impl.cc |
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
| index a0e63e38b01b243425dc0d84c684cd7ba423fe18..eb58a802d97919101e834ef0ceca038063539b94 100644 |
| --- a/content/renderer/render_frame_impl.cc |
| +++ b/content/renderer/render_frame_impl.cc |
| @@ -1009,6 +1009,7 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) { |
| IPC_MESSAGE_HANDLER(FrameMsg_SetAccessibilityMode, |
| OnSetAccessibilityMode) |
| IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener) |
| + IPC_MESSAGE_HANDLER(FrameMsg_DispatchLoad, OnDispatchLoad) |
| IPC_MESSAGE_HANDLER(FrameMsg_CommitNavigation, OnCommitNavigation) |
| #if defined(OS_ANDROID) |
| IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems) |
| @@ -1548,6 +1549,18 @@ void RenderFrameImpl::OnDisownOpener() { |
| frame_->setOpener(NULL); |
| } |
| +void RenderFrameImpl::OnDispatchLoad(int subframe_routing_id) { |
|
nasko
2015/02/24 22:47:11
nit: Shouldn't we call the parameter name "proxy_r
alexmos
2015/02/24 23:31:18
Routing through the proxy made this argument unnec
|
| + // The child frame should be a proxy in parent's process. |
| + RenderFrameProxy* subframe = |
| + RenderFrameProxy::FromRoutingID(subframe_routing_id); |
| + |
| + // Only dispatch the event if the proxy still exists. |
| + if (subframe) { |
| + CHECK(subframe->web_frame()->parent() == frame_); |
| + subframe->web_frame()->DispatchLoadEventForFrameOwner(); |
| + } |
| +} |
| + |
| #if defined(OS_ANDROID) |
| void RenderFrameImpl::OnSelectPopupMenuItems( |
| bool canceled, |
| @@ -2765,6 +2778,10 @@ void RenderFrameImpl::didChangeThemeColor() { |
| routing_id_, frame_->document().themeColor())); |
| } |
| +void RenderFrameImpl::dispatchLoad() { |
| + Send(new FrameHostMsg_DispatchLoad(routing_id_)); |
| +} |
| + |
| void RenderFrameImpl::requestNotificationPermission( |
| const blink::WebSecurityOrigin& origin, |
| blink::WebNotificationPermissionCallback* callback) { |