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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 938123003: Prevent hang monitor restarts when hidden (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup Created 5 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
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 7c5b4c8d572698699bb5fd2c621dda73a55f0fc7..440511d2ea5069f7ccf072340e326afb3897a974 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -1678,9 +1678,10 @@ void RenderFrameHostImpl::JavaScriptDialogClosed(
// leave the current page. In this case, use the regular timeout value used
// during the (before)unload handling.
if (is_waiting) {
- render_view_host_->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(
- success ? RenderViewHostImpl::kUnloadTimeoutMS
- : render_view_host_->hung_renderer_delay_ms_));
+ render_view_host_->StartHangMonitorTimeout(
+ success
+ ? TimeDelta::FromMilliseconds(RenderViewHostImpl::kUnloadTimeoutMS)
+ : render_view_host_->hung_renderer_delay_);
}
FrameHostMsg_RunJavaScriptMessage::WriteReplyParams(reply_msg,
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_guest.cc ('k') | content/browser/renderer_host/render_widget_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698