OLD | NEW |
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 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc
e-loading | 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc
e-loading |
6 | 6 |
7 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 7 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
8 | 8 |
9 #include <set> | 9 #include <set> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1093 ResourceType::IsFrame(request_data.resource_type); | 1093 ResourceType::IsFrame(request_data.resource_type); |
1094 | 1094 |
1095 // Make extra info and read footer (contains request ID). | 1095 // Make extra info and read footer (contains request ID). |
1096 ResourceRequestInfoImpl* extra_info = | 1096 ResourceRequestInfoImpl* extra_info = |
1097 new ResourceRequestInfoImpl( | 1097 new ResourceRequestInfoImpl( |
1098 process_type, | 1098 process_type, |
1099 child_id, | 1099 child_id, |
1100 route_id, | 1100 route_id, |
1101 request_data.origin_pid, | 1101 request_data.origin_pid, |
1102 request_id, | 1102 request_id, |
| 1103 request_data.render_frame_id, |
1103 request_data.is_main_frame, | 1104 request_data.is_main_frame, |
1104 request_data.frame_id, | 1105 request_data.frame_id, |
1105 request_data.parent_is_main_frame, | 1106 request_data.parent_is_main_frame, |
1106 request_data.parent_frame_id, | 1107 request_data.parent_frame_id, |
1107 request_data.resource_type, | 1108 request_data.resource_type, |
1108 request_data.transition_type, | 1109 request_data.transition_type, |
1109 request_data.should_replace_current_entry, | 1110 request_data.should_replace_current_entry, |
1110 false, // is download | 1111 false, // is download |
1111 false, // is stream | 1112 false, // is stream |
1112 allow_download, | 1113 allow_download, |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1264 int child_id, | 1265 int child_id, |
1265 int route_id, | 1266 int route_id, |
1266 bool download, | 1267 bool download, |
1267 ResourceContext* context) { | 1268 ResourceContext* context) { |
1268 return new ResourceRequestInfoImpl( | 1269 return new ResourceRequestInfoImpl( |
1269 PROCESS_TYPE_RENDERER, | 1270 PROCESS_TYPE_RENDERER, |
1270 child_id, | 1271 child_id, |
1271 route_id, | 1272 route_id, |
1272 0, | 1273 0, |
1273 request_id_, | 1274 request_id_, |
| 1275 MSG_ROUTING_NONE, // render_frame_id |
1274 false, // is_main_frame | 1276 false, // is_main_frame |
1275 -1, // frame_id | 1277 -1, // frame_id |
1276 false, // parent_is_main_frame | 1278 false, // parent_is_main_frame |
1277 -1, // parent_frame_id | 1279 -1, // parent_frame_id |
1278 ResourceType::SUB_RESOURCE, | 1280 ResourceType::SUB_RESOURCE, |
1279 PAGE_TRANSITION_LINK, | 1281 PAGE_TRANSITION_LINK, |
1280 false, // should_replace_current_entry | 1282 false, // should_replace_current_entry |
1281 download, // is_download | 1283 download, // is_download |
1282 false, // is_stream | 1284 false, // is_stream |
1283 download, // allow_download | 1285 download, // allow_download |
(...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1974 if ((load_flags & net::LOAD_REPORT_RAW_HEADERS) | 1976 if ((load_flags & net::LOAD_REPORT_RAW_HEADERS) |
1975 && !policy->CanReadRawCookies(child_id)) { | 1977 && !policy->CanReadRawCookies(child_id)) { |
1976 VLOG(1) << "Denied unauthorized request for raw headers"; | 1978 VLOG(1) << "Denied unauthorized request for raw headers"; |
1977 load_flags &= ~net::LOAD_REPORT_RAW_HEADERS; | 1979 load_flags &= ~net::LOAD_REPORT_RAW_HEADERS; |
1978 } | 1980 } |
1979 | 1981 |
1980 return load_flags; | 1982 return load_flags; |
1981 } | 1983 } |
1982 | 1984 |
1983 } // namespace content | 1985 } // namespace content |
OLD | NEW |