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

Unified Diff: chrome/renderer/render_view.cc

Issue 3561008: Implement the frame id required for the web navigation api. (Closed)
Patch Set: updates Created 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/render_view.cc
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 38a44f3d047e5c5a93322b4dc928bec3e8148b19..495a1f35fad4f23190e0cd00e8a8758634ea8e95 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1311,6 +1311,7 @@ void RenderView::UpdateURL(WebFrame* frame) {
params.http_status_code = response.httpStatusCode();
params.is_post = false;
params.page_id = page_id_;
+ params.frame_id = frame->identifier();
params.is_content_filtered = response.isContentFiltered();
params.was_within_same_page = navigation_state->was_within_same_page();
if (!navigation_state->security_info().empty()) {
@@ -2884,7 +2885,7 @@ void RenderView::didStartProvisionalLoad(WebFrame* frame) {
}
Send(new ViewHostMsg_DidStartProvisionalLoadForFrame(
- routing_id_, is_top_most, ds->request().url()));
+ routing_id_, frame->identifier(), is_top_most, ds->request().url()));
}
void RenderView::didReceiveServerRedirectForProvisionalLoad(WebFrame* frame) {
@@ -2922,8 +2923,8 @@ void RenderView::didFailProvisionalLoad(WebFrame* frame,
(error.reason == net::ERR_CACHE_MISS &&
EqualsASCII(failed_request.httpMethod(), "POST"));
Send(new ViewHostMsg_DidFailProvisionalLoadWithError(
- routing_id_, !frame->parent(), error.reason, error.unreachableURL,
- show_repost_interstitial));
+ routing_id_, frame->identifier(), !frame->parent(), error.reason,
+ error.unreachableURL, show_repost_interstitial));
// Don't display an error page if this is simply a cancelled load. Aside
// from being dumb, WebCore doesn't expect it and it will cause a crash.
« no previous file with comments | « chrome/common/render_messages_params.cc ('k') | chrome/test/data/extensions/api_test/webnavigation/navigation/iframe/d.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698