Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: chrome/browser/renderer_host/render_view_host.cc

Issue 160494: Disable input events when a JS dialog is showing. (Closed)
Patch Set: beforeunload Created 11 years, 4 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
Index: chrome/browser/renderer_host/render_view_host.cc
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 2bbedcef123603c6379c94a2fa049ad2b413a827..ae1f1c8a9eaa0389aade6faff1e18df1563c745d 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -561,6 +561,7 @@ void RenderViewHost::CaptureThumbnail() {
void RenderViewHost::JavaScriptMessageBoxClosed(IPC::Message* reply_msg,
bool success,
const std::wstring& prompt) {
+ process()->set_ignore_input_events(false);
if (is_waiting_for_unload_ack_) {
if (are_javascript_messages_suppressed_) {
delegate_->RendererUnresponsive(this, is_waiting_for_unload_ack_);
@@ -1266,6 +1267,9 @@ void RenderViewHost::OnMsgRunJavaScriptMessage(
const GURL& frame_url,
const int flags,
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();
SignalModalDialogEvent();
delegate_->RunJavaScriptMessage(message, default_prompt, frame_url, flags,
@@ -1276,6 +1280,9 @@ void RenderViewHost::OnMsgRunJavaScriptMessage(
void RenderViewHost::OnMsgRunBeforeUnloadConfirm(const GURL& frame_url,
const std::wstring& message,
IPC::Message* reply_msg) {
+ // While a JS before unload dialog is showing, tabs in the same process
+ // shouldn't process input events.
+ process()->set_ignore_input_events(true);
StopHangMonitorTimeout();
SignalModalDialogEvent();
delegate_->RunBeforeUnloadConfirm(message, reply_msg);
« no previous file with comments | « chrome/browser/renderer_host/render_process_host.cc ('k') | chrome/browser/renderer_host/render_widget_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698