OOPIF-ize hung renderers part 2
This modernizes the WebContentsDelegate interface.
BUG=767526
Change-Id: Ifac5cccf4798f80ef1abb365c80db75609268002
Reviewed-on: https://chromium-review.googlesource.com/889766
Reviewed-by: Peter Kasting <[email protected]>
Reviewed-by: Ted Choc <[email protected]>
Reviewed-by: Alex Moshchuk <[email protected]>
Reviewed-by: Fady Samuel <[email protected]>
Commit-Queue: Avi Drissman <[email protected]>
Cr-Commit-Position: refs/heads/master@{#533366}diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 34db9757..31e65f9e7 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5426,27 +5426,22 @@
for (auto& observer : observers_)
observer.OnRendererUnresponsive(hung_process);
- // Don't show hung renderer dialog for a swapped out RVH.
- if (render_widget_host != GetRenderViewHost()->GetWidget())
- return;
-
if (ShouldIgnoreUnresponsiveRenderer())
return;
- if (!GetRenderViewHost() || !GetRenderViewHost()->IsRenderViewLive())
+ if (!render_widget_host->renderer_initialized())
return;
if (delegate_)
- delegate_->RendererUnresponsive(this);
+ delegate_->RendererUnresponsive(this, hung_process);
}
void WebContentsImpl::RendererResponsive(
RenderWidgetHostImpl* render_widget_host) {
- if (render_widget_host != GetRenderViewHost()->GetWidget())
- return;
+ RenderProcessHost* hung_process = render_widget_host->GetProcess();
if (delegate_)
- delegate_->RendererResponsive(this);
+ delegate_->RendererResponsive(this, hung_process);
}
void WebContentsImpl::BeforeUnloadFiredFromRenderManager(
