Chromium Code Reviews| 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 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1048 info.cors_exposed_header_names.end(), cors_exposed_header_names.begin(), | 1048 info.cors_exposed_header_names.end(), cors_exposed_header_names.begin(), |
| 1049 [](const std::string& h) { return blink::WebString::fromLatin1(h); }); | 1049 [](const std::string& h) { return blink::WebString::fromLatin1(h); }); |
| 1050 response->setCorsExposedHeaderNames(cors_exposed_header_names); | 1050 response->setCorsExposedHeaderNames(cors_exposed_header_names); |
| 1051 response->addToEncodedDataLength(info.encoded_data_length); | 1051 response->addToEncodedDataLength(info.encoded_data_length); |
| 1052 | 1052 |
| 1053 SetSecurityStyleAndDetails(url, info, response, report_security_info); | 1053 SetSecurityStyleAndDetails(url, info, response, report_security_info); |
| 1054 | 1054 |
| 1055 WebURLResponseExtraDataImpl* extra_data = | 1055 WebURLResponseExtraDataImpl* extra_data = |
| 1056 new WebURLResponseExtraDataImpl(info.alpn_negotiated_protocol); | 1056 new WebURLResponseExtraDataImpl(info.alpn_negotiated_protocol); |
| 1057 response->setExtraData(extra_data); | 1057 response->setExtraData(extra_data); |
| 1058 response->setALPNNegotiatedProtocol( | |
|
panicker
2016/10/19 00:25:11
move this before setting of extra data (line 1052
sunjian
2016/10/21 00:19:50
Done.
| |
| 1059 WebString::fromUTF8(info.alpn_negotiated_protocol)); | |
| 1058 extra_data->set_was_fetched_via_spdy(info.was_fetched_via_spdy); | 1060 extra_data->set_was_fetched_via_spdy(info.was_fetched_via_spdy); |
| 1059 extra_data->set_was_alpn_negotiated(info.was_alpn_negotiated); | 1061 extra_data->set_was_alpn_negotiated(info.was_alpn_negotiated); |
| 1060 extra_data->set_was_alternate_protocol_available( | 1062 extra_data->set_was_alternate_protocol_available( |
| 1061 info.was_alternate_protocol_available); | 1063 info.was_alternate_protocol_available); |
| 1062 extra_data->set_connection_info(info.connection_info); | 1064 extra_data->set_connection_info(info.connection_info); |
| 1063 extra_data->set_is_using_lofi(info.is_using_lofi); | 1065 extra_data->set_is_using_lofi(info.is_using_lofi); |
| 1064 extra_data->set_effective_connection_type(info.effective_connection_type); | 1066 extra_data->set_effective_connection_type(info.effective_connection_type); |
| 1065 | 1067 |
| 1066 // If there's no received headers end time, don't set load timing. This is | 1068 // If there's no received headers end time, don't set load timing. This is |
| 1067 // the case for non-HTTP requests, requests that don't go over the wire, and | 1069 // the case for non-HTTP requests, requests that don't go over the wire, and |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1234 int intra_priority_value) { | 1236 int intra_priority_value) { |
| 1235 context_->DidChangePriority(new_priority, intra_priority_value); | 1237 context_->DidChangePriority(new_priority, intra_priority_value); |
| 1236 } | 1238 } |
| 1237 | 1239 |
| 1238 void WebURLLoaderImpl::setLoadingTaskRunner( | 1240 void WebURLLoaderImpl::setLoadingTaskRunner( |
| 1239 blink::WebTaskRunner* loading_task_runner) { | 1241 blink::WebTaskRunner* loading_task_runner) { |
| 1240 context_->SetTaskRunner(loading_task_runner->toSingleThreadTaskRunner()); | 1242 context_->SetTaskRunner(loading_task_runner->toSingleThreadTaskRunner()); |
| 1241 } | 1243 } |
| 1242 | 1244 |
| 1243 } // namespace content | 1245 } // namespace content |
| OLD | NEW |