| OLD | NEW |
| 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 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 715 if (CommandLine::ForCurrentProcess()->HasSwitch( | 715 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 716 switches::kEnableMemoryBenchmarking)) | 716 switches::kEnableMemoryBenchmarking)) |
| 717 channel_->AddFilter(new MemoryBenchmarkMessageFilter()); | 717 channel_->AddFilter(new MemoryBenchmarkMessageFilter()); |
| 718 #endif | 718 #endif |
| 719 } | 719 } |
| 720 | 720 |
| 721 int RenderProcessHostImpl::GetNextRoutingID() { | 721 int RenderProcessHostImpl::GetNextRoutingID() { |
| 722 return widget_helper_->GetNextRoutingID(); | 722 return widget_helper_->GetNextRoutingID(); |
| 723 } | 723 } |
| 724 | 724 |
| 725 void RenderProcessHostImpl::SimulateSwapOutACK( | 725 void RenderProcessHostImpl::ResumeDeferredNavigation( |
| 726 const ViewMsg_SwapOut_Params& params) { | 726 const GlobalRequestID& request_id) { |
| 727 widget_helper_->SimulateSwapOutACK(params); | 727 widget_helper_->ResumeDeferredNavigation(request_id); |
| 728 } | 728 } |
| 729 | 729 |
| 730 bool RenderProcessHostImpl::WaitForBackingStoreMsg( | 730 bool RenderProcessHostImpl::WaitForBackingStoreMsg( |
| 731 int render_widget_id, | 731 int render_widget_id, |
| 732 const base::TimeDelta& max_delay, | 732 const base::TimeDelta& max_delay, |
| 733 IPC::Message* msg) { | 733 IPC::Message* msg) { |
| 734 // The post task to this thread with the process id could be in queue, and we | 734 // The post task to this thread with the process id could be in queue, and we |
| 735 // don't want to dispatch a message before then since it will need the handle. | 735 // don't want to dispatch a message before then since it will need the handle. |
| 736 if (child_process_launcher_.get() && child_process_launcher_->IsStarting()) | 736 if (child_process_launcher_.get() && child_process_launcher_->IsStarting()) |
| 737 return false; | 737 return false; |
| (...skipping 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1804 continue; | 1804 continue; |
| 1805 | 1805 |
| 1806 RenderViewHost* rvh = | 1806 RenderViewHost* rvh = |
| 1807 RenderViewHost::From(const_cast<RenderWidgetHost*>(widget)); | 1807 RenderViewHost::From(const_cast<RenderWidgetHost*>(widget)); |
| 1808 | 1808 |
| 1809 rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences()); | 1809 rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences()); |
| 1810 } | 1810 } |
| 1811 } | 1811 } |
| 1812 | 1812 |
| 1813 } // namespace content | 1813 } // namespace content |
| OLD | NEW |