| 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 9dcc19e7939e166d9cfce4c5bd6cee41f54f8668..5f4809570b99d6a1d427726d5410849077e26829 100644
|
| --- a/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
|
| +++ b/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
|
| @@ -168,6 +168,7 @@ ResourceResponse::ResourceResponse(CrossThreadResourceResponseData* data)
|
| m_securityDetails.protocol = data->m_securityDetails.protocol;
|
| m_securityDetails.cipher = data->m_securityDetails.cipher;
|
| m_securityDetails.keyExchange = data->m_securityDetails.keyExchange;
|
| + m_securityDetails.keyExchangeGroup = data->m_securityDetails.keyExchangeGroup;
|
| m_securityDetails.mac = data->m_securityDetails.mac;
|
| m_securityDetails.certID = data->m_securityDetails.certID;
|
| m_securityDetails.sctList = data->m_securityDetails.sctList;
|
| @@ -220,6 +221,7 @@ std::unique_ptr<CrossThreadResourceResponseData> ResourceResponse::copyData() co
|
| data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy();
|
| data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy();
|
| data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolatedCopy();
|
| + data->m_securityDetails.keyExchangeGroup = m_securityDetails.keyExchangeGroup.isolatedCopy();
|
| data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy();
|
| data->m_securityDetails.certID = m_securityDetails.certID;
|
| data->m_securityDetails.sctList = isolatedCopy(m_securityDetails.sctList);
|
| @@ -377,10 +379,11 @@ 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, const SignedCertificateTimestampList& sctList)
|
| +void ResourceResponse::setSecurityDetails(const String& protocol, const String& keyExchange, const String& keyExchangeGroup, const String& cipher, const String& mac, int certId, const SignedCertificateTimestampList& sctList)
|
| {
|
| m_securityDetails.protocol = protocol;
|
| m_securityDetails.keyExchange = keyExchange;
|
| + m_securityDetails.keyExchangeGroup = keyExchangeGroup;
|
| m_securityDetails.cipher = cipher;
|
| m_securityDetails.mac = mac;
|
| m_securityDetails.certID = certId;
|
|
|