diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-11-22 16:16:53 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-11-29 14:27:22 +0000 |
| commit | 75390a1c00859ec805dcab6a88380f62a9f641d9 (patch) | |
| tree | 6e117b5432f7a39b0c4dd7ce6495d29ad27559ce | |
| parent | 4dd3a30491e1630b389cede36c8f3ac89f5be01a (diff) | |
| download | qtwebengine-chromium-75390a1c00859ec805dcab6a88380f62a9f641d9.tar.gz | |
[Backport] [TabDiscarding] Reset the sudden termination features flag when renderer dies
Without this a DCHECK fires when the new process re-sends these flags.
Originally added in https://chromium-review.googlesource.com/c/chromium/src/+/562616
R=JAM
BUG=754515
Reviewed-on: https://chromium-review.googlesource.com/630243
Task-number: QTBUG-58698
Change-Id: Ia0bfe31be092e44d09ba83c717e1d7892dd5dfc1
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/content/browser/frame_host/render_frame_host_impl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/content/browser/frame_host/render_frame_host_impl.cc b/chromium/content/browser/frame_host/render_frame_host_impl.cc index 53e241dafc0..9e8f66c5466 100644 --- a/chromium/content/browser/frame_host/render_frame_host_impl.cc +++ b/chromium/content/browser/frame_host/render_frame_host_impl.cc @@ -1830,6 +1830,10 @@ void RenderFrameHostImpl::OnRenderProcessGone(int status, int exit_code) { javascript_callbacks_.clear(); visual_state_callbacks_.clear(); + // Any termination disablers in content loaded by the new process will + // be sent again. + sudden_termination_disabler_types_enabled_ = 0; + // Ensure that future remote interface requests are associated with the new // process's channel. remote_associated_interfaces_.reset(); |