Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Side by Side Diff: content/child/web_url_loader_impl.cc

Issue 1271733002: [2/3 chromium] Support redirect option of Request and "opaqueredirect" response type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 WebURLRequest::FetchCredentialsModeOmit); 184 WebURLRequest::FetchCredentialsModeOmit);
185 STATIC_ASSERT_MATCHING_ENUMS(FETCH_CREDENTIALS_MODE_SAME_ORIGIN, 185 STATIC_ASSERT_MATCHING_ENUMS(FETCH_CREDENTIALS_MODE_SAME_ORIGIN,
186 WebURLRequest::FetchCredentialsModeSameOrigin); 186 WebURLRequest::FetchCredentialsModeSameOrigin);
187 STATIC_ASSERT_MATCHING_ENUMS(FETCH_CREDENTIALS_MODE_INCLUDE, 187 STATIC_ASSERT_MATCHING_ENUMS(FETCH_CREDENTIALS_MODE_INCLUDE,
188 WebURLRequest::FetchCredentialsModeInclude); 188 WebURLRequest::FetchCredentialsModeInclude);
189 189
190 FetchCredentialsMode GetFetchCredentialsMode(const WebURLRequest& request) { 190 FetchCredentialsMode GetFetchCredentialsMode(const WebURLRequest& request) {
191 return static_cast<FetchCredentialsMode>(request.fetchCredentialsMode()); 191 return static_cast<FetchCredentialsMode>(request.fetchCredentialsMode());
192 } 192 }
193 193
194 STATIC_ASSERT_MATCHING_ENUMS(FETCH_REDIRECT_MODE_FOLLOW,
195 WebURLRequest::FetchRedirectModeFollow);
196 STATIC_ASSERT_MATCHING_ENUMS(FETCH_REDIRECT_MODE_ERROR,
197 WebURLRequest::FetchRedirectModeError);
198 STATIC_ASSERT_MATCHING_ENUMS(FETCH_REDIRECT_MODE_MANUAL,
199 WebURLRequest::FetchRedirectModeManual);
200
201 FetchRedirectMode GetFetchRedirectMode(const WebURLRequest& request) {
202 return static_cast<FetchRedirectMode>(request.fetchRedirectMode());
203 }
204
194 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_AUXILIARY, 205 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_AUXILIARY,
195 WebURLRequest::FrameTypeAuxiliary); 206 WebURLRequest::FrameTypeAuxiliary);
196 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_NESTED, 207 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_NESTED,
197 WebURLRequest::FrameTypeNested); 208 WebURLRequest::FrameTypeNested);
198 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_NONE, 209 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_NONE,
199 WebURLRequest::FrameTypeNone); 210 WebURLRequest::FrameTypeNone);
200 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL, 211 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL,
201 WebURLRequest::FrameTypeTopLevel); 212 WebURLRequest::FrameTypeTopLevel);
202 213
203 RequestContextFrameType GetRequestContextFrameType( 214 RequestContextFrameType GetRequestContextFrameType(
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 request_info.priority = 512 request_info.priority =
502 ConvertWebKitPriorityToNetPriority(request.priority()); 513 ConvertWebKitPriorityToNetPriority(request.priority());
503 request_info.appcache_host_id = request.appCacheHostID(); 514 request_info.appcache_host_id = request.appCacheHostID();
504 request_info.routing_id = request.requestorID(); 515 request_info.routing_id = request.requestorID();
505 request_info.download_to_file = request.downloadToFile(); 516 request_info.download_to_file = request.downloadToFile();
506 request_info.has_user_gesture = request.hasUserGesture(); 517 request_info.has_user_gesture = request.hasUserGesture();
507 request_info.skip_service_worker = request.skipServiceWorker(); 518 request_info.skip_service_worker = request.skipServiceWorker();
508 request_info.should_reset_appcache = request.shouldResetAppCache(); 519 request_info.should_reset_appcache = request.shouldResetAppCache();
509 request_info.fetch_request_mode = GetFetchRequestMode(request); 520 request_info.fetch_request_mode = GetFetchRequestMode(request);
510 request_info.fetch_credentials_mode = GetFetchCredentialsMode(request); 521 request_info.fetch_credentials_mode = GetFetchCredentialsMode(request);
522 request_info.fetch_redirect_mode = GetFetchRedirectMode(request);
511 request_info.fetch_request_context_type = GetRequestContextType(request); 523 request_info.fetch_request_context_type = GetRequestContextType(request);
512 request_info.fetch_frame_type = GetRequestContextFrameType(request); 524 request_info.fetch_frame_type = GetRequestContextFrameType(request);
513 request_info.extra_data = request.extraData(); 525 request_info.extra_data = request.extraData();
514 526
515 scoped_refptr<ResourceRequestBody> request_body = 527 scoped_refptr<ResourceRequestBody> request_body =
516 GetRequestBodyForWebURLRequest(request).get(); 528 GetRequestBodyForWebURLRequest(request).get();
517 529
518 if (sync_load_response) { 530 if (sync_load_response) {
519 resource_dispatcher_->StartSync( 531 resource_dispatcher_->StartSync(
520 request_info, request_body.get(), sync_load_response); 532 request_info, request_body.get(), sync_load_response);
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 int intra_priority_value) { 1074 int intra_priority_value) {
1063 context_->DidChangePriority(new_priority, intra_priority_value); 1075 context_->DidChangePriority(new_priority, intra_priority_value);
1064 } 1076 }
1065 1077
1066 bool WebURLLoaderImpl::attachThreadedDataReceiver( 1078 bool WebURLLoaderImpl::attachThreadedDataReceiver(
1067 blink::WebThreadedDataReceiver* threaded_data_receiver) { 1079 blink::WebThreadedDataReceiver* threaded_data_receiver) {
1068 return context_->AttachThreadedDataReceiver(threaded_data_receiver); 1080 return context_->AttachThreadedDataReceiver(threaded_data_receiver);
1069 } 1081 }
1070 1082
1071 } // namespace content 1083 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698