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

Unified Diff: net/http/http_network_transaction.cc

Issue 12701011: [Net] Propagate priority changes from URLRequest to HttpTransaction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: net/http/http_network_transaction.cc
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 5b120f765ae7da7fdf9e368e4639df27b9a8f175..643244b66eafb2699be330f97b3d274f77d13417 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -385,6 +385,27 @@ UploadProgress HttpNetworkTransaction::GetUploadProgress() const {
return static_cast<HttpStream*>(stream_.get())->GetUploadProgress();
}
+bool HttpNetworkTransaction::GetLoadTimingInfo(
mmenke 2013/03/12 18:40:22 Thanks for fixing my misplacement of this function
+ LoadTimingInfo* load_timing_info) const {
+ if (!stream_ || !stream_->GetLoadTimingInfo(load_timing_info))
+ return false;
+
+ load_timing_info->proxy_resolve_start =
+ proxy_info_.proxy_resolve_start_time();
+ load_timing_info->proxy_resolve_end = proxy_info_.proxy_resolve_end_time();
+ load_timing_info->send_start = send_start_time_;
+ load_timing_info->send_end = send_end_time_;
+ load_timing_info->receive_headers_end = receive_headers_end_;
+ return true;
+}
+
+void HttpNetworkTransaction::SetPriority(RequestPriority priority) {
+ net_log_.AddEvent(NetLog::TYPE_HTTP_TRANSACTION_SET_PRIORITY,
+ NetLog::IntegerCallback("priority", priority));
mmenke 2013/03/12 18:40:22 I don't think this is an event worth logging. Htt
akalin 2013/03/12 22:08:28 Okay. I think we should still keep the new one URL
mmenke 2013/03/12 22:58:26 I agree that we should keep the one in URLRequest.
+ // TODO(akalin): Plumb this through to |stream_request_| and
+ // |stream_|.
+}
+
void HttpNetworkTransaction::OnStreamReady(const SSLConfig& used_ssl_config,
const ProxyInfo& used_proxy_info,
HttpStreamBase* stream) {
@@ -482,20 +503,6 @@ void HttpNetworkTransaction::OnHttpsProxyTunnelResponse(
OnIOComplete(ERR_HTTPS_PROXY_TUNNEL_RESPONSE);
}
-bool HttpNetworkTransaction::GetLoadTimingInfo(
- LoadTimingInfo* load_timing_info) const {
- if (!stream_ || !stream_->GetLoadTimingInfo(load_timing_info))
- return false;
-
- load_timing_info->proxy_resolve_start =
- proxy_info_.proxy_resolve_start_time();
- load_timing_info->proxy_resolve_end = proxy_info_.proxy_resolve_end_time();
- load_timing_info->send_start = send_start_time_;
- load_timing_info->send_end = send_end_time_;
- load_timing_info->receive_headers_end = receive_headers_end_;
- return true;
-}
-
bool HttpNetworkTransaction::is_https_request() const {
return request_->url.SchemeIs("https");
}

Powered by Google App Engine
This is Rietveld 408576698