Chromium Code Reviews| Index: third_party/WebKit/Source/platform/network/ResourceResponse.cpp |
| diff --git a/third_party/WebKit/Source/platform/network/ResourceResponse.cpp b/third_party/WebKit/Source/platform/network/ResourceResponse.cpp |
| index 06fa838f14636c0fc0b0fd3743914777936af385..31c3ba033eaa3dbb3a67e23bde4c9e6768ea13b6 100644 |
| --- a/third_party/WebKit/Source/platform/network/ResourceResponse.cpp |
| +++ b/third_party/WebKit/Source/platform/network/ResourceResponse.cpp |
| @@ -31,6 +31,20 @@ |
| namespace blink { |
| +ResourceResponse::SignedCertificateTimestamp::SignedCertificateTimestamp( |
| + const blink::WebURLResponse::SignedCertificateTimestamp& sct) |
| + : status(sct.status) |
| + , origin(sct.origin) |
| + , version(sct.version) |
|
palmer
2016/05/23 19:54:25
I think you might want to adhere to the m_fooBar c
dwaxweiler
2016/05/27 23:13:00
Acknowledged.
|
| + , logDescription(sct.logDescription) |
| + , logId(sct.logId) |
| + , timestamp(sct.timestamp) |
| + , hashAlgorithm(sct.hashAlgorithm) |
| + , signatureAlgorithm(sct.signatureAlgorithm) |
| + , signatureData(sct.signatureData) |
| +{ |
| +} |
| + |
| ResourceResponse::ResourceResponse() |
| : m_expectedContentLength(0) |
| , m_httpStatusCode(0) |
| @@ -125,6 +139,7 @@ ResourceResponse::ResourceResponse(CrossThreadResourceResponseData* data) |
| m_securityDetails.numUnknownSCTs = data->m_securityDetails.numUnknownSCTs; |
| m_securityDetails.numInvalidSCTs = data->m_securityDetails.numInvalidSCTs; |
| m_securityDetails.numValidSCTs = data->m_securityDetails.numValidSCTs; |
| + m_securityDetails.sctList = data->m_securityDetails.sctList; |
| m_httpVersion = data->m_httpVersion; |
| m_appCacheID = data->m_appCacheID; |
| m_appCacheManifestURL = data->m_appCacheManifestURL.copy(); |
| @@ -173,6 +188,7 @@ PassOwnPtr<CrossThreadResourceResponseData> ResourceResponse::copyData() const |
| data->m_securityDetails.numUnknownSCTs = m_securityDetails.numUnknownSCTs; |
| data->m_securityDetails.numInvalidSCTs = m_securityDetails.numInvalidSCTs; |
| data->m_securityDetails.numValidSCTs = m_securityDetails.numValidSCTs; |
| + data->m_securityDetails.sctList = m_securityDetails.sctList; |
| data->m_httpVersion = m_httpVersion; |
| data->m_appCacheID = m_appCacheID; |
| data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); |
| @@ -324,7 +340,7 @@ void ResourceResponse::updateHeaderParsedState(const AtomicString& name) |
| m_haveParsedLastModifiedHeader = false; |
| } |
| -void ResourceResponse::setSecurityDetails(const String& protocol, const String& keyExchange, const String& cipher, const String& mac, int certId, size_t numUnknownScts, size_t numInvalidScts, size_t numValidScts) |
| +void ResourceResponse::setSecurityDetails(const String& protocol, const String& keyExchange, const String& cipher, const String& mac, int certId, size_t numUnknownScts, size_t numInvalidScts, size_t numValidScts, const SignedCertificateTimestampList& sctList) |
| { |
| m_securityDetails.protocol = protocol; |
| m_securityDetails.keyExchange = keyExchange; |
| @@ -334,6 +350,7 @@ void ResourceResponse::setSecurityDetails(const String& protocol, const String& |
| m_securityDetails.numUnknownSCTs = numUnknownScts; |
| m_securityDetails.numInvalidSCTs = numInvalidScts; |
| m_securityDetails.numValidSCTs = numValidScts; |
| + m_securityDetails.sctList = sctList; |
| } |
| void ResourceResponse::setHTTPHeaderField(const AtomicString& name, const AtomicString& value) |