diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-03 21:29:35 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-03 21:29:35 +0000 |
| commit | 79a702895e17d13056da5454830de5a9244b4f04 (patch) | |
| tree | 1a4a145eceb46ddf7566dd62b6e359767ec687e3 /content/browser/loader/resource_dispatcher_host_impl.cc | |
| parent | 45172e6e478a359eba9c05bc72dd0b4c241a65c8 (diff) | |
| download | chromium_src-79a702895e17d13056da5454830de5a9244b4f04.zip chromium_src-79a702895e17d13056da5454830de5a9244b4f04.tar.gz chromium_src-79a702895e17d13056da5454830de5a9244b4f04.tar.bz2 | |
Update resource requests to remove redundant frame ID.
BUG=314791
TEST=No behavior change.
R=battre@chromium.org, nasko@chromium.org
TBR=dcheng@chromium.org, jochen@chromium.org
Review URL: https://codereview.chromium.org/184873004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader/resource_dispatcher_host_impl.cc')
| -rw-r--r-- | content/browser/loader/resource_dispatcher_host_impl.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index 1dbba49..5b2e78b 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 |