| 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 ef0e15cfe089cd45d0028deb540f829369f6a4d5..a564e6b2af8d8546d0e406fa96930a45baa16b60 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -1421,7 +1421,6 @@ void RenderFrameHostImpl::OnBeforeUnloadACK(
|
| TRACE_EVENT_ASYNC_END1("navigation", "RenderFrameHostImpl BeforeUnload", this,
|
| "FrameTreeNode id",
|
| frame_tree_node_->frame_tree_node_id());
|
| - DCHECK(!GetParent());
|
| // If this renderer navigated while the beforeunload request was in flight, we
|
| // may have cleared this state in OnDidCommitProvisionalLoad, in which case we
|
| // can ignore this message.
|
| @@ -2537,8 +2536,7 @@ void RenderFrameHostImpl::SimulateBeforeUnloadAck() {
|
| }
|
|
|
| bool RenderFrameHostImpl::ShouldDispatchBeforeUnload() {
|
| - // TODO(creis): Support beforeunload on subframes.
|
| - return !GetParent() && IsRenderFrameLive();
|
| + return IsRenderFrameLive();
|
| }
|
|
|
| void RenderFrameHostImpl::UpdateOpener() {
|
|
|