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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 129813006: Move DidReceiveServerRedirectForProvisionalLoad from RenderView to RenderFrame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/containers/hash_tables.h" 7 #include "base/containers/hash_tables.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "content/browser/frame_host/cross_process_frame_connector.h" 9 #include "content/browser/frame_host/cross_process_frame_connector.h"
10 #include "content/browser/frame_host/frame_tree.h" 10 #include "content/browser/frame_host/frame_tree.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 return true; 110 return true;
111 111
112 bool handled = true; 112 bool handled = true;
113 bool msg_is_ok = true; 113 bool msg_is_ok = true;
114 IPC_BEGIN_MESSAGE_MAP_EX(RenderFrameHostImpl, msg, msg_is_ok) 114 IPC_BEGIN_MESSAGE_MAP_EX(RenderFrameHostImpl, msg, msg_is_ok)
115 IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach) 115 IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach)
116 IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartProvisionalLoadForFrame, 116 IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartProvisionalLoadForFrame,
117 OnDidStartProvisionalLoadForFrame) 117 OnDidStartProvisionalLoadForFrame)
118 IPC_MESSAGE_HANDLER(FrameHostMsg_DidFailProvisionalLoadWithError, 118 IPC_MESSAGE_HANDLER(FrameHostMsg_DidFailProvisionalLoadWithError,
119 OnDidFailProvisionalLoadWithError) 119 OnDidFailProvisionalLoadWithError)
120 IPC_MESSAGE_HANDLER(FrameHostMsg_DidRedirectProvisionalLoad,
121 OnDidRedirectProvisionalLoad)
120 IPC_MESSAGE_HANDLER(FrameHostMsg_SwapOut_ACK, OnSwapOutACK) 122 IPC_MESSAGE_HANDLER(FrameHostMsg_SwapOut_ACK, OnSwapOutACK)
121 IPC_END_MESSAGE_MAP_EX() 123 IPC_END_MESSAGE_MAP_EX()
122 124
123 if (!msg_is_ok) { 125 if (!msg_is_ok) {
124 // The message had a handler, but its de-serialization failed. 126 // The message had a handler, but its de-serialization failed.
125 // Kill the renderer. 127 // Kill the renderer.
126 RecordAction(UserMetricsAction("BadMessageTerminate_RFH")); 128 RecordAction(UserMetricsAction("BadMessageTerminate_RFH"));
127 GetProcess()->ReceivedBadMessage(); 129 GetProcess()->ReceivedBadMessage();
128 } 130 }
129 131
(...skipping 25 matching lines...) Expand all
155 const GURL& url) { 157 const GURL& url) {
156 frame_tree_node_->navigator()->DidStartProvisionalLoad( 158 frame_tree_node_->navigator()->DidStartProvisionalLoad(
157 this, frame_id, parent_frame_id, is_main_frame, url); 159 this, frame_id, parent_frame_id, is_main_frame, url);
158 } 160 }
159 161
160 void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( 162 void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
161 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { 163 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
162 frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); 164 frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
163 } 165 }
164 166
167 void RenderFrameHostImpl::OnDidRedirectProvisionalLoad(
168 int32 page_id,
169 const GURL& source_url,
170 const GURL& target_url) {
171 frame_tree_node_->navigator()->DidRedirectProvisionalLoad(
172 this, page_id, source_url, target_url);
173 }
174
165 void RenderFrameHostImpl::SwapOut() { 175 void RenderFrameHostImpl::SwapOut() {
166 if (render_view_host_->IsRenderViewLive()) { 176 if (render_view_host_->IsRenderViewLive()) {
167 Send(new FrameMsg_SwapOut(routing_id())); 177 Send(new FrameMsg_SwapOut(routing_id()));
168 } else { 178 } else {
169 // Our RenderViewHost doesn't have a live renderer, so just skip the unload 179 // Our RenderViewHost doesn't have a live renderer, so just skip the unload
170 // event. 180 // event.
171 OnSwappedOut(true); 181 OnSwappedOut(true);
172 } 182 }
173 } 183 }
174 184
175 void RenderFrameHostImpl::OnSwapOutACK() { 185 void RenderFrameHostImpl::OnSwapOutACK() {
176 OnSwappedOut(false); 186 OnSwappedOut(false);
177 } 187 }
178 188
179 void RenderFrameHostImpl::OnSwappedOut(bool timed_out) { 189 void RenderFrameHostImpl::OnSwappedOut(bool timed_out) {
180 frame_tree_node_->render_manager()->SwappedOutFrame(this); 190 frame_tree_node_->render_manager()->SwappedOutFrame(this);
181 } 191 }
182 192
183 } // namespace content 193 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698