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

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

Issue 2737553003: Remove ChildProcess.HangRendererType. (Closed)
Patch Set: rebase to tot Created 3 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 64c719ca49b2d5c906fd33c22a2edd5a21ec2d69..944d444d2d9d16492223aa0b817f738e1876673d 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -2544,8 +2544,7 @@ void RenderFrameHostImpl::DispatchBeforeUnload(bool for_navigation,
render_view_host_->GetWidget()->increment_in_flight_event_count();
render_view_host_->GetWidget()->StartHangMonitorTimeout(
TimeDelta::FromMilliseconds(RenderViewHostImpl::kUnloadTimeoutMS),
- blink::WebInputEvent::Undefined,
- RendererUnresponsiveType::RENDERER_UNRESPONSIVE_BEFORE_UNLOAD);
+ blink::WebInputEvent::Undefined);
send_before_unload_start_time_ = base::TimeTicks::Now();
Send(new FrameMsg_BeforeUnload(routing_id_, is_reload));
}
@@ -2619,14 +2618,11 @@ void RenderFrameHostImpl::JavaScriptDialogClosed(
// leave the current page. In this case, use the regular timeout value used
// during the beforeunload handling.
if (is_before_unload_dialog) {
- RendererUnresponsiveType type =
- success ? RendererUnresponsiveType::RENDERER_UNRESPONSIVE_BEFORE_UNLOAD
- : RendererUnresponsiveType::RENDERER_UNRESPONSIVE_DIALOG_CLOSED;
render_view_host_->GetWidget()->StartHangMonitorTimeout(
success
? TimeDelta::FromMilliseconds(RenderViewHostImpl::kUnloadTimeoutMS)
: render_view_host_->GetWidget()->hung_renderer_delay(),
- blink::WebInputEvent::Undefined, type);
+ blink::WebInputEvent::Undefined);
}
SendJavaScriptDialogReply(reply_msg, success, user_input);
@@ -2639,8 +2635,7 @@ void RenderFrameHostImpl::JavaScriptDialogClosed(
// a response.
if (is_before_unload_dialog && dialog_was_suppressed) {
render_view_host_->GetWidget()->delegate()->RendererUnresponsive(
- render_view_host_->GetWidget(),
- RendererUnresponsiveType::RENDERER_UNRESPONSIVE_DIALOG_SUPPRESSED);
+ render_view_host_->GetWidget());
}
}
« no previous file with comments | « content/browser/devtools/devtools_manager_unittest.cc ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698