| 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 <openssl/ssl.h> | 7 #include <openssl/ssl.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 646 | 646 |
| 647 WebURLResponse response; | 647 WebURLResponse response; |
| 648 PopulateURLResponse(request_.url(), info, &response, | 648 PopulateURLResponse(request_.url(), info, &response, |
| 649 request_.reportRawHeaders()); | 649 request_.reportRawHeaders()); |
| 650 | 650 |
| 651 WebURLRequest new_request; | 651 WebURLRequest new_request; |
| 652 PopulateURLRequestForRedirect( | 652 PopulateURLRequestForRedirect( |
| 653 request_, redirect_info, | 653 request_, redirect_info, |
| 654 info.was_fetched_via_service_worker | 654 info.was_fetched_via_service_worker |
| 655 ? blink::WebURLRequest::SkipServiceWorker::None | 655 ? blink::WebURLRequest::SkipServiceWorker::None |
| 656 : blink::WebURLRequest::SkipServiceWorker::All, | 656 : blink::WebURLRequest::SkipServiceWorker::Controlling, |
| 657 &new_request); | 657 &new_request); |
| 658 | 658 |
| 659 bool follow = client_->willFollowRedirect(loader_, new_request, response); | 659 bool follow = client_->willFollowRedirect(loader_, new_request, response); |
| 660 if (!follow) { | 660 if (!follow) { |
| 661 request_ = WebURLRequest(); | 661 request_ = WebURLRequest(); |
| 662 | 662 |
| 663 return false; | 663 return false; |
| 664 } | 664 } |
| 665 | 665 |
| 666 DCHECK(WebURL(redirect_info.new_url) == new_request.url()); | 666 DCHECK(WebURL(redirect_info.new_url) == new_request.url()); |
| (...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1234 int intra_priority_value) { | 1234 int intra_priority_value) { |
| 1235 context_->DidChangePriority(new_priority, intra_priority_value); | 1235 context_->DidChangePriority(new_priority, intra_priority_value); |
| 1236 } | 1236 } |
| 1237 | 1237 |
| 1238 void WebURLLoaderImpl::setLoadingTaskRunner( | 1238 void WebURLLoaderImpl::setLoadingTaskRunner( |
| 1239 blink::WebTaskRunner* loading_task_runner) { | 1239 blink::WebTaskRunner* loading_task_runner) { |
| 1240 context_->SetTaskRunner(loading_task_runner->toSingleThreadTaskRunner()); | 1240 context_->SetTaskRunner(loading_task_runner->toSingleThreadTaskRunner()); |
| 1241 } | 1241 } |
| 1242 | 1242 |
| 1243 } // namespace content | 1243 } // namespace content |
| OLD | NEW |