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

Unified Diff: net/http/http_response_info.cc

Issue 851503003: Update from https://crrev.com/311076 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « net/http/http_response_info.h ('k') | net/http/http_response_info_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_response_info.cc
diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc
index 630a59e8082994ac4f7a91fb89f1d1ff3104aeb3..b5b94c48e2dfdc47242f948a3316bc57d03059d9 100644
--- a/net/http/http_response_info.cc
+++ b/net/http/http_response_info.cc
@@ -91,6 +91,8 @@ enum {
// This bit is set if ssl_info has SCTs.
RESPONSE_INFO_HAS_SIGNED_CERTIFICATE_TIMESTAMPS = 1 << 20,
+ RESPONSE_INFO_UNUSED_SINCE_PREFETCH = 1 << 21,
+
// TODO(darin): Add other bits to indicate alternate request methods.
// For now, we don't support storing those.
};
@@ -103,6 +105,7 @@ HttpResponseInfo::HttpResponseInfo()
was_npn_negotiated(false),
was_fetched_via_proxy(false),
did_use_http_auth(false),
+ unused_since_prefetch(false),
connection_info(CONNECTION_INFO_UNKNOWN) {
}
@@ -115,6 +118,7 @@ HttpResponseInfo::HttpResponseInfo(const HttpResponseInfo& rhs)
was_fetched_via_proxy(rhs.was_fetched_via_proxy),
proxy_server(rhs.proxy_server),
did_use_http_auth(rhs.did_use_http_auth),
+ unused_since_prefetch(rhs.unused_since_prefetch),
socket_address(rhs.socket_address),
npn_negotiated_protocol(rhs.npn_negotiated_protocol),
connection_info(rhs.connection_info),
@@ -140,6 +144,7 @@ HttpResponseInfo& HttpResponseInfo::operator=(const HttpResponseInfo& rhs) {
was_npn_negotiated = rhs.was_npn_negotiated;
was_fetched_via_proxy = rhs.was_fetched_via_proxy;
did_use_http_auth = rhs.did_use_http_auth;
+ unused_since_prefetch = rhs.unused_since_prefetch;
socket_address = rhs.socket_address;
npn_negotiated_protocol = rhs.npn_negotiated_protocol;
connection_info = rhs.connection_info;
@@ -277,6 +282,8 @@ bool HttpResponseInfo::InitFromPickle(const Pickle& pickle,
did_use_http_auth = (flags & RESPONSE_INFO_USE_HTTP_AUTHENTICATION) != 0;
+ unused_since_prefetch = (flags & RESPONSE_INFO_UNUSED_SINCE_PREFETCH) != 0;
+
return true;
}
@@ -308,6 +315,8 @@ void HttpResponseInfo::Persist(Pickle* pickle,
flags |= RESPONSE_INFO_HAS_CONNECTION_INFO;
if (did_use_http_auth)
flags |= RESPONSE_INFO_USE_HTTP_AUTHENTICATION;
+ if (unused_since_prefetch)
+ flags |= RESPONSE_INFO_UNUSED_SINCE_PREFETCH;
if (!ssl_info.signed_certificate_timestamps.empty())
flags |= RESPONSE_INFO_HAS_SIGNED_CERTIFICATE_TIMESTAMPS;
« no previous file with comments | « net/http/http_response_info.h ('k') | net/http/http_response_info_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698