OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "content/child/web_url_loader_impl.h" | 5 #include "content/child/web_url_loader_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
188 WebURLRequest::FetchCredentialsModeOmit); | 188 WebURLRequest::FetchCredentialsModeOmit); |
189 STATIC_ASSERT_MATCHING_ENUMS(FETCH_CREDENTIALS_MODE_SAME_ORIGIN, | 189 STATIC_ASSERT_MATCHING_ENUMS(FETCH_CREDENTIALS_MODE_SAME_ORIGIN, |
190 WebURLRequest::FetchCredentialsModeSameOrigin); | 190 WebURLRequest::FetchCredentialsModeSameOrigin); |
191 STATIC_ASSERT_MATCHING_ENUMS(FETCH_CREDENTIALS_MODE_INCLUDE, | 191 STATIC_ASSERT_MATCHING_ENUMS(FETCH_CREDENTIALS_MODE_INCLUDE, |
192 WebURLRequest::FetchCredentialsModeInclude); | 192 WebURLRequest::FetchCredentialsModeInclude); |
193 | 193 |
194 FetchCredentialsMode GetFetchCredentialsMode(const WebURLRequest& request) { | 194 FetchCredentialsMode GetFetchCredentialsMode(const WebURLRequest& request) { |
195 return static_cast<FetchCredentialsMode>(request.fetchCredentialsMode()); | 195 return static_cast<FetchCredentialsMode>(request.fetchCredentialsMode()); |
196 } | 196 } |
197 | 197 |
| 198 STATIC_ASSERT_MATCHING_ENUMS(FetchRedirectMode::FOLLOW_MODE, |
| 199 WebURLRequest::FetchRedirectModeFollow); |
| 200 STATIC_ASSERT_MATCHING_ENUMS(FetchRedirectMode::ERROR_MODE, |
| 201 WebURLRequest::FetchRedirectModeError); |
| 202 STATIC_ASSERT_MATCHING_ENUMS(FetchRedirectMode::MANUAL_MODE, |
| 203 WebURLRequest::FetchRedirectModeManual); |
| 204 |
| 205 FetchRedirectMode GetFetchRedirectMode(const WebURLRequest& request) { |
| 206 return static_cast<FetchRedirectMode>(request.fetchRedirectMode()); |
| 207 } |
| 208 |
198 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_AUXILIARY, | 209 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_AUXILIARY, |
199 WebURLRequest::FrameTypeAuxiliary); | 210 WebURLRequest::FrameTypeAuxiliary); |
200 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_NESTED, | 211 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_NESTED, |
201 WebURLRequest::FrameTypeNested); | 212 WebURLRequest::FrameTypeNested); |
202 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_NONE, | 213 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_NONE, |
203 WebURLRequest::FrameTypeNone); | 214 WebURLRequest::FrameTypeNone); |
204 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL, | 215 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL, |
205 WebURLRequest::FrameTypeTopLevel); | 216 WebURLRequest::FrameTypeTopLevel); |
206 | 217 |
207 RequestContextFrameType GetRequestContextFrameType( | 218 RequestContextFrameType GetRequestContextFrameType( |
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
583 request_info.priority = | 594 request_info.priority = |
584 ConvertWebKitPriorityToNetPriority(request.priority()); | 595 ConvertWebKitPriorityToNetPriority(request.priority()); |
585 request_info.appcache_host_id = request.appCacheHostID(); | 596 request_info.appcache_host_id = request.appCacheHostID(); |
586 request_info.routing_id = request.requestorID(); | 597 request_info.routing_id = request.requestorID(); |
587 request_info.download_to_file = request.downloadToFile(); | 598 request_info.download_to_file = request.downloadToFile(); |
588 request_info.has_user_gesture = request.hasUserGesture(); | 599 request_info.has_user_gesture = request.hasUserGesture(); |
589 request_info.skip_service_worker = request.skipServiceWorker(); | 600 request_info.skip_service_worker = request.skipServiceWorker(); |
590 request_info.should_reset_appcache = request.shouldResetAppCache(); | 601 request_info.should_reset_appcache = request.shouldResetAppCache(); |
591 request_info.fetch_request_mode = GetFetchRequestMode(request); | 602 request_info.fetch_request_mode = GetFetchRequestMode(request); |
592 request_info.fetch_credentials_mode = GetFetchCredentialsMode(request); | 603 request_info.fetch_credentials_mode = GetFetchCredentialsMode(request); |
| 604 request_info.fetch_redirect_mode = GetFetchRedirectMode(request); |
593 request_info.fetch_request_context_type = GetRequestContextType(request); | 605 request_info.fetch_request_context_type = GetRequestContextType(request); |
594 request_info.fetch_frame_type = GetRequestContextFrameType(request); | 606 request_info.fetch_frame_type = GetRequestContextFrameType(request); |
595 request_info.extra_data = request.extraData(); | 607 request_info.extra_data = request.extraData(); |
596 | 608 |
597 scoped_refptr<ResourceRequestBody> request_body = | 609 scoped_refptr<ResourceRequestBody> request_body = |
598 GetRequestBodyForWebURLRequest(request).get(); | 610 GetRequestBodyForWebURLRequest(request).get(); |
599 | 611 |
600 if (sync_load_response) { | 612 if (sync_load_response) { |
601 resource_dispatcher_->StartSync( | 613 resource_dispatcher_->StartSync( |
602 request_info, request_body.get(), sync_load_response); | 614 request_info, request_body.get(), sync_load_response); |
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1151 int intra_priority_value) { | 1163 int intra_priority_value) { |
1152 context_->DidChangePriority(new_priority, intra_priority_value); | 1164 context_->DidChangePriority(new_priority, intra_priority_value); |
1153 } | 1165 } |
1154 | 1166 |
1155 bool WebURLLoaderImpl::attachThreadedDataReceiver( | 1167 bool WebURLLoaderImpl::attachThreadedDataReceiver( |
1156 blink::WebThreadedDataReceiver* threaded_data_receiver) { | 1168 blink::WebThreadedDataReceiver* threaded_data_receiver) { |
1157 return context_->AttachThreadedDataReceiver(threaded_data_receiver); | 1169 return context_->AttachThreadedDataReceiver(threaded_data_receiver); |
1158 } | 1170 } |
1159 | 1171 |
1160 } // namespace content | 1172 } // namespace content |
OLD | NEW |