| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/renderer_host/resource_dispatcher_host.h" | 7 #include "content/browser/renderer_host/resource_dispatcher_host.h" |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 488 resource_context.blob_storage_context()->controller()-> | 488 resource_context.blob_storage_context()->controller()-> |
| 489 ResolveBlobReferencesInUploadData(request_data.upload_data.get()); | 489 ResolveBlobReferencesInUploadData(request_data.upload_data.get()); |
| 490 } | 490 } |
| 491 | 491 |
| 492 if (is_shutdown_ || | 492 if (is_shutdown_ || |
| 493 !ShouldServiceRequest(process_type, child_id, request_data)) { | 493 !ShouldServiceRequest(process_type, child_id, request_data)) { |
| 494 AbortRequestBeforeItStarts(filter_, sync_result, route_id, request_id); | 494 AbortRequestBeforeItStarts(filter_, sync_result, route_id, request_id); |
| 495 return; | 495 return; |
| 496 } | 496 } |
| 497 | 497 |
| 498 const GURL referrer = MaybeStripReferrer(request_data.referrer); | 498 const content::Referrer referrer(MaybeStripReferrer(request_data.referrer), |
| 499 request_data.referrer_policy); |
| 499 | 500 |
| 500 // Allow the observer to block/handle the request. | 501 // Allow the observer to block/handle the request. |
| 501 if (delegate_ && !delegate_->ShouldBeginRequest(child_id, | 502 if (delegate_ && !delegate_->ShouldBeginRequest(child_id, |
| 502 route_id, | 503 route_id, |
| 503 request_data.method, | 504 request_data.method, |
| 504 request_data.url, | 505 request_data.url, |
| 505 request_data.resource_type, | 506 request_data.resource_type, |
| 506 resource_context, | 507 resource_context, |
| 507 referrer)) { | 508 referrer)) { |
| 508 AbortRequestBeforeItStarts(filter_, sync_result, route_id, request_id); | 509 AbortRequestBeforeItStarts(filter_, sync_result, route_id, request_id); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 531 } | 532 } |
| 532 | 533 |
| 533 // Construct the request. | 534 // Construct the request. |
| 534 net::URLRequest* request; | 535 net::URLRequest* request; |
| 535 if (deferred_request) { | 536 if (deferred_request) { |
| 536 request = deferred_request; | 537 request = deferred_request; |
| 537 } else { | 538 } else { |
| 538 request = new net::URLRequest(request_data.url, this); | 539 request = new net::URLRequest(request_data.url, this); |
| 539 request->set_method(request_data.method); | 540 request->set_method(request_data.method); |
| 540 request->set_first_party_for_cookies(request_data.first_party_for_cookies); | 541 request->set_first_party_for_cookies(request_data.first_party_for_cookies); |
| 541 request->set_referrer(referrer.spec()); | 542 request->set_referrer(referrer.url.spec()); |
| 542 net::HttpRequestHeaders headers; | 543 net::HttpRequestHeaders headers; |
| 543 headers.AddHeadersFromString(request_data.headers); | 544 headers.AddHeadersFromString(request_data.headers); |
| 544 request->SetExtraRequestHeaders(headers); | 545 request->SetExtraRequestHeaders(headers); |
| 545 } | 546 } |
| 546 | 547 |
| 547 int load_flags = request_data.load_flags; | 548 int load_flags = request_data.load_flags; |
| 548 // Although EV status is irrelevant to sub-frames and sub-resources, we have | 549 // Although EV status is irrelevant to sub-frames and sub-resources, we have |
| 549 // to perform EV certificate verification on all resources because an HTTP | 550 // to perform EV certificate verification on all resources because an HTTP |
| 550 // keep-alive connection created to load a sub-frame or a sub-resource could | 551 // keep-alive connection created to load a sub-frame or a sub-resource could |
| 551 // be reused to load a main frame. | 552 // be reused to load a main frame. |
| (...skipping 1682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2234 | 2235 |
| 2235 void ResourceDispatcherHost::set_allow_cross_origin_auth_prompt(bool value) { | 2236 void ResourceDispatcherHost::set_allow_cross_origin_auth_prompt(bool value) { |
| 2236 allow_cross_origin_auth_prompt_ = value; | 2237 allow_cross_origin_auth_prompt_ = value; |
| 2237 } | 2238 } |
| 2238 | 2239 |
| 2239 void ResourceDispatcherHost::MarkAsTransferredNavigation( | 2240 void ResourceDispatcherHost::MarkAsTransferredNavigation( |
| 2240 const GlobalRequestID& transferred_request_id, | 2241 const GlobalRequestID& transferred_request_id, |
| 2241 net::URLRequest* ransferred_request) { | 2242 net::URLRequest* ransferred_request) { |
| 2242 transferred_navigations_[transferred_request_id] = ransferred_request; | 2243 transferred_navigations_[transferred_request_id] = ransferred_request; |
| 2243 } | 2244 } |
| OLD | NEW |