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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 11090068: When starting a provisional load include the parent frame ID in the IPC and pass it down the th WCO… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 (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 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 3216 matching lines...) Expand 10 before | Expand all | Expand 10 after
3227 // Take note of AUTO_SUBFRAME loads here, so that we can know how to 3227 // Take note of AUTO_SUBFRAME loads here, so that we can know how to
3228 // load an error page. See didFailProvisionalLoad. 3228 // load an error page. See didFailProvisionalLoad.
3229 document_state->navigation_state()->set_transition_type( 3229 document_state->navigation_state()->set_transition_type(
3230 content::PAGE_TRANSITION_AUTO_SUBFRAME); 3230 content::PAGE_TRANSITION_AUTO_SUBFRAME);
3231 } 3231 }
3232 3232
3233 FOR_EACH_OBSERVER( 3233 FOR_EACH_OBSERVER(
3234 RenderViewObserver, observers_, DidStartProvisionalLoad(frame)); 3234 RenderViewObserver, observers_, DidStartProvisionalLoad(frame));
3235 3235
3236 Send(new ViewHostMsg_DidStartProvisionalLoadForFrame( 3236 Send(new ViewHostMsg_DidStartProvisionalLoadForFrame(
3237 routing_id_, frame->identifier(), is_top_most, GetOpenerUrl(), 3237 routing_id_, frame->identifier(),
3238 ds->request().url())); 3238 frame->parent() ? frame->parent()->identifier() : -1,
3239 is_top_most, GetOpenerUrl(), ds->request().url()));
3239 } 3240 }
3240 3241
3241 void RenderViewImpl::didReceiveServerRedirectForProvisionalLoad( 3242 void RenderViewImpl::didReceiveServerRedirectForProvisionalLoad(
3242 WebFrame* frame) { 3243 WebFrame* frame) {
3243 if (frame->parent()) 3244 if (frame->parent())
3244 return; 3245 return;
3245 // Received a redirect on the main frame. 3246 // Received a redirect on the main frame.
3246 WebDataSource* data_source = frame->provisionalDataSource(); 3247 WebDataSource* data_source = frame->provisionalDataSource();
3247 if (!data_source) { 3248 if (!data_source) {
3248 // Should only be invoked when we have a data source. 3249 // Should only be invoked when we have a data source.
(...skipping 3100 matching lines...) Expand 10 before | Expand all | Expand 10 after
6349 6350
6350 updating_frame_tree_ = true; 6351 updating_frame_tree_ = true;
6351 active_frame_id_map_.clear(); 6352 active_frame_id_map_.clear();
6352 6353
6353 target_process_id_ = process_id; 6354 target_process_id_ = process_id;
6354 target_routing_id_ = route_id; 6355 target_routing_id_ = route_id;
6355 CreateFrameTree(webview()->mainFrame(), frames); 6356 CreateFrameTree(webview()->mainFrame(), frames);
6356 6357
6357 updating_frame_tree_ = false; 6358 updating_frame_tree_ = false;
6358 } 6359 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698