summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/render_widget_helper.cc
diff options
context:
space:
mode:
authorcreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 17:16:42 +0000
committercreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 17:16:42 +0000
commit04af706692f548f16b25f2f02ab6b757dea580ad (patch)
tree1962db22e06790fe89be8d783951f44df3ffa819 /content/browser/renderer_host/render_widget_helper.cc
parent1f1effe018bcd3afb1fb09e28c676485f13fc037 (diff)
downloadchromium_src-04af706692f548f16b25f2f02ab6b757dea580ad.zip
chromium_src-04af706692f548f16b25f2f02ab6b757dea580ad.tar.gz
chromium_src-04af706692f548f16b25f2f02ab6b757dea580ad.tar.bz2
Revert 132407 - Fixing a problem, where a hung renderer process is not killed when navigating away
Reverting along with 132852 due to suspected impact on stability numbers. BUG=104346 TEST=Steps to reproduce listed in the bug. Review URL: http://codereview.chromium.org/10065028 TBR=nasko@chromium.org Review URL: https://chromiumcodereview.appspot.com/10356103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_widget_helper.cc')
-rw-r--r--content/browser/renderer_host/render_widget_helper.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/renderer_host/render_widget_helper.cc b/content/browser/renderer_host/render_widget_helper.cc
index e516e6c..070b1d4 100644
--- a/content/browser/renderer_host/render_widget_helper.cc
+++ b/content/browser/renderer_host/render_widget_helper.cc
@@ -135,11 +135,11 @@ void RenderWidgetHelper::CancelResourceRequests(int render_widget_id) {
render_widget_id));
}
-void RenderWidgetHelper::SimulateSwapOutACK(
+void RenderWidgetHelper::CrossSiteSwapOutACK(
const ViewMsg_SwapOut_Params& params) {
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
- base::Bind(&RenderWidgetHelper::OnSimulateSwapOutACK,
+ base::Bind(&RenderWidgetHelper::OnCrossSiteSwapOutACK,
this,
params));
}
@@ -246,9 +246,9 @@ void RenderWidgetHelper::OnCancelResourceRequests(
render_process_id_, render_widget_id);
}
-void RenderWidgetHelper::OnSimulateSwapOutACK(
+void RenderWidgetHelper::OnCrossSiteSwapOutACK(
const ViewMsg_SwapOut_Params& params) {
- resource_dispatcher_host_->OnSimulateSwapOutACK(params);
+ resource_dispatcher_host_->OnSwapOutACK(params);
}
void RenderWidgetHelper::CreateNewWindow(