Chromium Code Reviews| Index: third_party/WebKit/Source/platform/network/ResourceResponse.h |
| diff --git a/third_party/WebKit/Source/platform/network/ResourceResponse.h b/third_party/WebKit/Source/platform/network/ResourceResponse.h |
| index 89d6480631a3725d55b76d2c3b2cf330b74e5aea..305807bd8636c18f857699eeba07b86703113f51 100644 |
| --- a/third_party/WebKit/Source/platform/network/ResourceResponse.h |
| +++ b/third_party/WebKit/Source/platform/network/ResourceResponse.h |
| @@ -34,12 +34,15 @@ |
| #include "platform/network/ResourceLoadInfo.h" |
| #include "platform/network/ResourceLoadTiming.h" |
| #include "platform/weborigin/KURL.h" |
| +#include "public/platform/WebURLResponse.h" |
| #include "public/platform/modules/serviceworker/WebServiceWorkerResponseType.h" |
| #include "wtf/PassOwnPtr.h" |
| #include "wtf/RefCounted.h" |
| #include "wtf/RefPtr.h" |
| #include "wtf/text/CString.h" |
| +#include <vector> |
|
dgozman
2016/06/04 00:27:37
Are we allowed to use vector in platform/ ? Could
estark
2016/06/08 16:51:55
Daniel, this should probably be wtf/Vector.h, simi
dwaxweiler
2016/06/08 19:31:10
Acknowledged.
|
| + |
| namespace blink { |
| struct CrossThreadResourceResponseData; |
| @@ -60,6 +63,41 @@ public: |
| SecurityStyleAuthenticated |
| }; |
| + class SignedCertificateTimestamp { |
|
dgozman
2016/06/04 00:27:37
I'm surprised why we don't reuse public/platform v
dwaxweiler
2016/06/08 19:31:10
I don't know whether a reuse is permitted.
|
| + public: |
| + SignedCertificateTimestamp( |
| + String status, |
| + String origin, |
| + String logDescription, |
| + String logId, |
| + int64_t timestamp, |
| + String hashAlgorithm, |
| + String signatureAlgorithm, |
| + String signatureData) |
| + : m_status(status) |
| + , m_origin(origin) |
| + , m_logDescription(logDescription) |
| + , m_logId(logId) |
| + , m_timestamp(timestamp) |
| + , m_hashAlgorithm(hashAlgorithm) |
| + , m_signatureAlgorithm(signatureAlgorithm) |
| + , m_signatureData(signatureData) |
| + { |
| + } |
| + SignedCertificateTimestamp( |
|
dgozman
2016/06/04 00:27:37
explicit?
dwaxweiler
2016/06/08 19:31:10
Acknowledged.
|
| + const struct blink::WebURLResponse::SignedCertificateTimestamp&); |
| + String m_status; |
| + String m_origin; |
| + String m_logDescription; |
| + String m_logId; |
| + int64_t m_timestamp; |
| + String m_hashAlgorithm; |
| + String m_signatureAlgorithm; |
| + String m_signatureData; |
| + }; |
| + |
| + using SignedCertificateTimestampList = std::vector<SignedCertificateTimestamp>; |
| + |
| struct SecurityDetails { |
| DISALLOW_NEW(); |
| SecurityDetails() |
| @@ -80,6 +118,7 @@ public: |
| size_t numUnknownSCTs; |
| size_t numInvalidSCTs; |
| size_t numValidSCTs; |
| + SignedCertificateTimestampList sctList; |
| }; |
| class ExtraData : public RefCounted<ExtraData> { |
| @@ -177,7 +216,7 @@ public: |
| void setSecurityStyle(SecurityStyle securityStyle) { m_securityStyle = securityStyle; } |
| const SecurityDetails* getSecurityDetails() const { return &m_securityDetails; } |
| - void 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 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); |
| long long appCacheID() const { return m_appCacheID; } |
| void setAppCacheID(long long id) { m_appCacheID = id; } |