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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 109653014: Allow RenderFrames to swap out for subframe navigations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Nasko's comments Created 7 years 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/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 135bfd6de0b96121bb8ddb321a768e14ee953a27..ac3ef84776deaec9453e7f1b653480c078e4ec7c 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -97,6 +97,7 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach)
IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartProvisionalLoadForFrame,
OnDidStartProvisionalLoadForFrame)
+ IPC_MESSAGE_HANDLER(FrameHostMsg_SwapOut_ACK, OnSwapOutACK)
IPC_END_MESSAGE_MAP_EX()
if (!msg_is_ok) {
@@ -136,4 +137,22 @@ void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
this, frame_id, parent_frame_id, is_main_frame, url);
}
+void RenderFrameHostImpl::SwapOut() {
+ if (render_view_host_->IsRenderViewLive()) {
+ Send(new FrameMsg_SwapOut(routing_id()));
+ } else {
+ // Our RenderViewHost doesn't have a live renderer, so just skip the unload
+ // event.
+ OnSwappedOut(true);
+ }
+}
+
+void RenderFrameHostImpl::OnSwapOutACK() {
+ OnSwappedOut(false);
+}
+
+void RenderFrameHostImpl::OnSwappedOut(bool timed_out) {
+ frame_tree_node_->render_manager()->SwappedOutFrame(this);
+}
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698