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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 129813006: Move DidReceiveServerRedirectForProvisionalLoad from RenderView to RenderFrame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix layout test failures. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/browser/web_contents_observer.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 55b25367845fe18c2ca0c7a2681f622aaf77a0d3..75d1c44ce8418864ef38fa1be59b428347bded30 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -907,9 +907,24 @@ void RenderFrameImpl::didStartProvisionalLoad(blink::WebFrame* frame) {
void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad(
blink::WebFrame* frame) {
- // TODO(nasko): Move implementation here. Needed state:
- // * page_id_
- render_view_->didReceiveServerRedirectForProvisionalLoad(frame);
+ if (frame->parent())
+ return;
+ // Received a redirect on the main frame.
+ WebDataSource* data_source = frame->provisionalDataSource();
+ if (!data_source) {
+ // Should only be invoked when we have a data source.
+ NOTREACHED();
+ return;
+ }
+ std::vector<GURL> redirects;
+ RenderViewImpl::GetRedirectChain(data_source, &redirects);
+ if (redirects.size() >= 2) {
+ Send(new FrameHostMsg_DidRedirectProvisionalLoad(
+ routing_id_,
+ render_view_->page_id_,
+ redirects[redirects.size() - 2],
+ redirects.back()));
+ }
}
void RenderFrameImpl::didFailProvisionalLoad(
« no previous file with comments | « content/public/browser/web_contents_observer.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698