content/browser/web_contents/web_contents_impl.cc - Issue 2803633004: Revert of Keep track in the browser of which frames have onunload and onbeforeunload handlers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2803633004: Revert of Keep track in the browser of which frames have onunload and onbeforeunload handlers. (Closed)

Patch Set: Created 3 years, 8 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:

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index 1f5657a8edd3fb29d58bf79f689ff067fb13a8de..921ece3ec8a7e47f39bdfae3480d418ef9b0184f 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -1422,9 +1422,7 @@

bool WebContentsImpl::NeedToFireBeforeUnload() {

// TODO(creis): Should we fire even for interstitial pages?

return WillNotifyDisconnection() && !ShowingInterstitialPage() &&

- !GetRenderViewHost()->SuddenTerminationAllowed() &&

- (GetMainFrame()->ShouldDispatchBeforeUnload() ||

- GetMainFrame()->ShouldDispatchUnload());

+ !GetRenderViewHost()->SuddenTerminationAllowed();

}

void WebContentsImpl::DispatchBeforeUnload() {