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

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 208243019: Move SwapOut methods to RenderFrameHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Nasko's comment Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index e942a281cffce1162c11f819581336d49e3e70a1..6c2f1170ed34883e0220720192632cf9310fc1bb 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -576,26 +576,6 @@ void RenderViewHostImpl::SuppressDialogsUntilSwapOut() {
Send(new ViewMsg_SuppressDialogsUntilSwapOut(GetRoutingID()));
}
-void RenderViewHostImpl::SwapOut() {
- // If this RenderViewHost is not in the default state, it must have already
- // gone through this, therefore just return.
- if (rvh_state_ != STATE_DEFAULT)
- return;
-
- SetState(STATE_WAITING_FOR_UNLOAD_ACK);
- unload_event_monitor_timeout_->Start(
- base::TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
-
- if (IsRenderViewLive()) {
- Send(new ViewMsg_SwapOut(GetRoutingID()));
- }
- delegate_->SwappedOut(this);
-}
-
-void RenderViewHostImpl::OnSwapOutACK() {
- OnSwappedOut(false);
-}
-
void RenderViewHostImpl::OnSwappedOut(bool timed_out) {
// Ignore spurious swap out ack.
if (!IsWaitingForUnloadACK())
@@ -1149,7 +1129,6 @@ bool RenderViewHostImpl::OnMessageReceived(const IPC::Message& msg) {
IPC_MESSAGE_HANDLER(ViewHostMsg_FocusedNodeChanged, OnFocusedNodeChanged)
IPC_MESSAGE_HANDLER(ViewHostMsg_AddMessageToConsole, OnAddMessageToConsole)
IPC_MESSAGE_HANDLER(ViewHostMsg_ClosePage_ACK, OnClosePageACK)
- IPC_MESSAGE_HANDLER(ViewHostMsg_SwapOut_ACK, OnSwapOutACK)
#if defined(OS_ANDROID)
IPC_MESSAGE_HANDLER(ViewHostMsg_SelectionRootBoundsChanged,
OnSelectionRootBoundsChanged)
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698