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

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 184873004: Update resource requests to remove redundant frame ID. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update comments Created 6 years, 10 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: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index e8dc53eb7a67c136c5bb15b3ac1ea70dae50679d..361da9fdf8389753f53df475958c728aee526471 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -917,8 +917,8 @@ void ResourceDispatcherHostImpl::UpdateRequestForTransfer(
// ResourceRequestInfo rather than caching it locally. This lets us update
// the info object when a transfer occurs.
info->UpdateForTransfer(child_id, route_id, request_data.origin_pid,
- request_id, request_data.frame_id,
- request_data.parent_frame_id, filter_->GetWeakPtr());
+ request_id, request_data.parent_render_frame_id,
+ filter_->GetWeakPtr());
// Update maps that used the old IDs, if necessary. Some transfers in tests
// do not actually use a different ID, so not all maps need to be updated.
@@ -1096,9 +1096,8 @@ void ResourceDispatcherHostImpl::BeginRequest(
request_id,
request_data.render_frame_id,
request_data.is_main_frame,
- request_data.frame_id,
request_data.parent_is_main_frame,
- request_data.parent_frame_id,
+ request_data.parent_render_frame_id,
request_data.resource_type,
request_data.transition_type,
request_data.should_replace_current_entry,
@@ -1294,9 +1293,8 @@ ResourceRequestInfoImpl* ResourceDispatcherHostImpl::CreateRequestInfo(
request_id_,
MSG_ROUTING_NONE, // render_frame_id
false, // is_main_frame
- -1, // frame_id
false, // parent_is_main_frame
- -1, // parent_frame_id
+ -1, // parent_render_frame_id
ResourceType::SUB_RESOURCE,
PAGE_TRANSITION_LINK,
false, // should_replace_current_entry
« no previous file with comments | « content/browser/loader/cross_site_resource_handler.cc ('k') | content/browser/loader/resource_dispatcher_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698