Chromium Code Reviews| 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/renderer_host/resource_dispatcher_host_impl.h" | 7 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 927 // Construct the request. | 927 // Construct the request. |
| 928 scoped_ptr<net::URLRequest> new_request; | 928 scoped_ptr<net::URLRequest> new_request; |
| 929 net::URLRequest* request; | 929 net::URLRequest* request; |
| 930 if (deferred_loader.get()) { | 930 if (deferred_loader.get()) { |
| 931 request = deferred_loader->request(); | 931 request = deferred_loader->request(); |
| 932 | 932 |
| 933 // Give the ResourceLoader (or any of the ResourceHandlers held by it) a | 933 // Give the ResourceLoader (or any of the ResourceHandlers held by it) a |
| 934 // chance to reset some state before we complete the transfer. | 934 // chance to reset some state before we complete the transfer. |
| 935 deferred_loader->WillCompleteTransfer(); | 935 deferred_loader->WillCompleteTransfer(); |
| 936 } else { | 936 } else { |
| 937 new_request.reset(new net::URLRequest( | 937 new_request.reset(filter_-> |
| 938 request_data.url, | 938 GetURLRequestContext(request_data.resource_type)->CreateRequest( |
| 939 NULL, | 939 request_data.url, NULL)); |
|
mmenke
2012/08/24 14:40:11
optional nit: May want to separate out GetURLRequ
shalev
2012/08/24 19:07:06
Done.
| |
| 940 filter_->GetURLRequestContext(request_data.resource_type))); | |
| 941 request = new_request.get(); | 940 request = new_request.get(); |
| 942 | 941 |
| 943 request->set_method(request_data.method); | 942 request->set_method(request_data.method); |
| 944 request->set_first_party_for_cookies(request_data.first_party_for_cookies); | 943 request->set_first_party_for_cookies(request_data.first_party_for_cookies); |
| 945 request->set_referrer(referrer.url.spec()); | 944 request->set_referrer(referrer.url.spec()); |
| 946 webkit_glue::ConfigureURLRequestForReferrerPolicy(request, | 945 webkit_glue::ConfigureURLRequestForReferrerPolicy(request, |
| 947 referrer.policy); | 946 referrer.policy); |
| 948 net::HttpRequestHeaders headers; | 947 net::HttpRequestHeaders headers; |
| 949 headers.AddHeadersFromString(request_data.headers); | 948 headers.AddHeadersFromString(request_data.headers); |
| 950 request->SetExtraRequestHeaders(headers); | 949 request->SetExtraRequestHeaders(headers); |
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1256 request_context->job_factory()->IsHandledURL(url); | 1255 request_context->job_factory()->IsHandledURL(url); |
| 1257 if (!known_proto) { | 1256 if (!known_proto) { |
| 1258 // Since any URLs which have non-standard scheme have been filtered | 1257 // Since any URLs which have non-standard scheme have been filtered |
| 1259 // by save manager(see GURL::SchemeIsStandard). This situation | 1258 // by save manager(see GURL::SchemeIsStandard). This situation |
| 1260 // should not happen. | 1259 // should not happen. |
| 1261 NOTREACHED(); | 1260 NOTREACHED(); |
| 1262 return; | 1261 return; |
| 1263 } | 1262 } |
| 1264 | 1263 |
| 1265 scoped_ptr<net::URLRequest> request( | 1264 scoped_ptr<net::URLRequest> request( |
| 1266 new net::URLRequest(url, NULL, request_context)); | 1265 request_context->CreateRequest(url, NULL)); |
| 1267 request->set_method("GET"); | 1266 request->set_method("GET"); |
| 1268 request->set_referrer(MaybeStripReferrer(referrer.url).spec()); | 1267 request->set_referrer(MaybeStripReferrer(referrer.url).spec()); |
| 1269 webkit_glue::ConfigureURLRequestForReferrerPolicy(request.get(), | 1268 webkit_glue::ConfigureURLRequestForReferrerPolicy(request.get(), |
| 1270 referrer.policy); | 1269 referrer.policy); |
| 1271 // So far, for saving page, we need fetch content from cache, in the | 1270 // So far, for saving page, we need fetch content from cache, in the |
| 1272 // future, maybe we can use a configuration to configure this behavior. | 1271 // future, maybe we can use a configuration to configure this behavior. |
| 1273 request->set_load_flags(net::LOAD_PREFERRING_CACHE); | 1272 request->set_load_flags(net::LOAD_PREFERRING_CACHE); |
| 1274 | 1273 |
| 1275 // Since we're just saving some resources we need, disallow downloading. | 1274 // Since we're just saving some resources we need, disallow downloading. |
| 1276 ResourceRequestInfoImpl* extra_info = | 1275 ResourceRequestInfoImpl* extra_info = |
| (...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1728 | 1727 |
| 1729 return i->second.get(); | 1728 return i->second.get(); |
| 1730 } | 1729 } |
| 1731 | 1730 |
| 1732 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id, | 1731 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id, |
| 1733 int request_id) const { | 1732 int request_id) const { |
| 1734 return GetLoader(GlobalRequestID(child_id, request_id)); | 1733 return GetLoader(GlobalRequestID(child_id, request_id)); |
| 1735 } | 1734 } |
| 1736 | 1735 |
| 1737 } // namespace content | 1736 } // namespace content |
| OLD | NEW |