| 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 20d519fab496290289d8a771e58798c5f9db45ba..34eacf253d9170e5f18fd275869d1ea44d4f4937 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -584,7 +584,7 @@ void RenderFrameHostImpl::OnNavigate(const IPC::Message& msg) {
|
|
|
| // If we're waiting for a cross-site beforeunload ack from this renderer and
|
| // we receive a Navigate message from the main frame, then the renderer was
|
| - // navigating already and sent it before hearing the ViewMsg_Stop message.
|
| + // navigating already and sent it before hearing the FrameMsg_Stop message.
|
| // We do not want to cancel the pending navigation in this case, since the
|
| // old page will soon be stopped. Instead, treat this as a beforeunload ack
|
| // to allow the pending navigation to continue.
|
| @@ -1080,6 +1080,10 @@ void RenderFrameHostImpl::NavigateToURL(const GURL& url) {
|
| Navigate(params);
|
| }
|
|
|
| +void RenderFrameHostImpl::Stop() {
|
| + Send(new FrameMsg_Stop(routing_id_));
|
| +}
|
| +
|
| void RenderFrameHostImpl::DispatchBeforeUnload(bool for_cross_site_transition) {
|
| // TODO(creis): Support subframes.
|
| if (!render_view_host_->IsRenderViewLive() || GetParent()) {
|
|
|