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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 10008015: Fixing a problem, where a hung renderer process is not killed when navigating away (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing an uninitialized variable and improving the test. Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 } 548 }
549 549
550 int RenderProcessHostImpl::GetNextRoutingID() { 550 int RenderProcessHostImpl::GetNextRoutingID() {
551 return widget_helper_->GetNextRoutingID(); 551 return widget_helper_->GetNextRoutingID();
552 } 552 }
553 553
554 void RenderProcessHostImpl::CancelResourceRequests(int render_widget_id) { 554 void RenderProcessHostImpl::CancelResourceRequests(int render_widget_id) {
555 widget_helper_->CancelResourceRequests(render_widget_id); 555 widget_helper_->CancelResourceRequests(render_widget_id);
556 } 556 }
557 557
558 void RenderProcessHostImpl::CrossSiteSwapOutACK( 558 void RenderProcessHostImpl::SimulateSwapOutACK(
559 const ViewMsg_SwapOut_Params& params) { 559 const ViewMsg_SwapOut_Params& params) {
560 widget_helper_->CrossSiteSwapOutACK(params); 560 widget_helper_->SimulateSwapOutACK(params);
561 } 561 }
562 562
563 bool RenderProcessHostImpl::WaitForUpdateMsg( 563 bool RenderProcessHostImpl::WaitForUpdateMsg(
564 int render_widget_id, 564 int render_widget_id,
565 const base::TimeDelta& max_delay, 565 const base::TimeDelta& max_delay,
566 IPC::Message* msg) { 566 IPC::Message* msg) {
567 // The post task to this thread with the process id could be in queue, and we 567 // The post task to this thread with the process id could be in queue, and we
568 // don't want to dispatch a message before then since it will need the handle. 568 // don't want to dispatch a message before then since it will need the handle.
569 if (child_process_launcher_.get() && child_process_launcher_->IsStarting()) 569 if (child_process_launcher_.get() && child_process_launcher_->IsStarting())
570 return false; 570 return false;
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
1346 void RenderProcessHostImpl::OnRevealFolderInOS(const FilePath& path) { 1346 void RenderProcessHostImpl::OnRevealFolderInOS(const FilePath& path) {
1347 // Only honor the request if appropriate persmissions are granted. 1347 // Only honor the request if appropriate persmissions are granted.
1348 if (ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile(GetID(), 1348 if (ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile(GetID(),
1349 path)) 1349 path))
1350 content::GetContentClient()->browser()->OpenItem(path); 1350 content::GetContentClient()->browser()->OpenItem(path);
1351 } 1351 }
1352 1352
1353 void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) { 1353 void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) {
1354 MHTMLGenerationManager::GetInstance()->MHTMLGenerated(job_id, data_size); 1354 MHTMLGenerationManager::GetInstance()->MHTMLGenerated(job_id, data_size);
1355 } 1355 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698