content/browser/renderer_host/render_view_host.cc - Issue 6627063: Ignore JavaScript messages (alert/confirm/prompt) during unload 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/renderer_host/render_view_host.cc

Issue 6627063: Ignore JavaScript messages (alert/confirm/prompt) during unload handlers. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

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

View side-by-side diff with in-line comments

Download patch

« chrome/renderer/render_view.cc ('K') | « content/browser/renderer_host/render_view_host.h ('k') | content/browser/renderer_host/render_view_host_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_view_host.cc

diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc

index 1448beeb5f346d56898a89fc6e7185ce993be035..b41d5b94a79c12b76992450dfea8c9f58729bd60 100644

--- a/content/browser/renderer_host/render_view_host.cc

+++ b/content/browser/renderer_host/render_view_host.cc

@@ -1216,13 +1216,14 @@ void RenderViewHost::OnMsgRunJavaScriptMessage(

const std::wstring& default_prompt,

const GURL& frame_url,

const int flags,

+ const bool unload_handler_being_run,

IPC::Message* reply_msg) {

// While a JS message dialog is showing, tabs in the same process shouldn't

// process input events.

process()->set_ignore_input_events(true);

StopHangMonitorTimeout();

delegate_->RunJavaScriptMessage(message, default_prompt, frame_url, flags,

- reply_msg,

+ unload_handler_being_run, reply_msg,

&are_javascript_messages_suppressed_);

}