diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 18:03:41 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 18:03:41 +0000 |
| commit | c7221b423e1d051dc5b68cb3f66cfe11398f5696 (patch) | |
| tree | 480bce984bc7bda984545bf99a0ac10ea8ba2862 | |
| parent | 89278af959e205a83bee1b3c7458c642cafbedb4 (diff) | |
| download | chromium_src-c7221b423e1d051dc5b68cb3f66cfe11398f5696.zip chromium_src-c7221b423e1d051dc5b68cb3f66cfe11398f5696.tar.gz chromium_src-c7221b423e1d051dc5b68cb3f66cfe11398f5696.tar.bz2 | |
Revert 136325 - Revert 132852 - Removing the actual process termination to diagnose the kill rate.
BUG=104346
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10021058
Patch from Nasko Oskov <nasko@chromium.org>.
TBR=creis@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10383111
TBR=creis@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10383113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136341 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/renderer_host/render_view_host_browsertest.cc | 7 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_view_host_impl.cc | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc index effdbb8..a0f3ee1 100644 --- a/content/browser/renderer_host/render_view_host_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_browsertest.cc @@ -232,7 +232,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BaseURLParam) { // Test that a hung renderer is killed after navigating away during cross-site // navigation. -IN_PROC_BROWSER_TEST_F(RenderViewHostTest, UnresponsiveCrossSiteNavigation) { +// Disabling until actual process termination is enabled back. crbug.com/104346 +IN_PROC_BROWSER_TEST_F(RenderViewHostTest, + DISABLED_UnresponsiveCrossSiteNavigation) { WebContents* web_contents = NULL; WebContents* web_contents_2 = NULL; content::RenderProcessHost* rph = NULL; @@ -319,7 +321,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest, UnresponsiveCrossSiteNavigation) { } // Test that a hung renderer is killed when we are closing the page. -IN_PROC_BROWSER_TEST_F(RenderViewHostTest, UnresponsiveClosePage) { +// Disabling until actual process termination is enabled back. crbug.com/104346 +IN_PROC_BROWSER_TEST_F(RenderViewHostTest, DISABLED_UnresponsiveClosePage) { WebContents* web_contents = NULL; FilePath doc_root; diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index 62ef275..fb2a078 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -500,7 +500,10 @@ void RenderViewHostImpl::WasSwappedOut() { // beforeunload handler completes fine, but the unload handler hangs. // At this time, the complexity to solve this edge case is not worthwhile. if (SuddenTerminationAllowed()) { - base::KillProcess(process_handle, content::RESULT_CODE_HUNG, false); + // We should kill the process, but for now, just log the data so we can + // diagnose the kill rate and investigate if separate timer is needed. + // http://crbug.com/104346. + // Log a histogram point to help us diagnose how many of those kills // we have performed. 1 is the enum value for RendererType Normal for // the histogram. |