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 cd3cf5f766d6cfcb90dff38ff1c00e473eba185c..7ad444d7bc870948e17aa71ae1618475b92ef223 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> |
|
estark
2016/05/20 22:36:42
This should be above the other includes.
dwaxweiler
2016/05/21 09:21:37
That yields a presubmit error "check-webkit-style
|
| + |
| namespace blink { |
| struct CrossThreadResourceResponseData; |
| @@ -60,6 +63,44 @@ public: |
| SecurityStyleAuthenticated |
| }; |
| + class SignedCertificateTimestamp { |
| + public: |
| + SignedCertificateTimestamp( |
| + String status, |
| + String origin, |
| + String version, |
| + String logDescription, |
| + String logId, |
| + int64_t timestamp, |
| + String hashAlgorithm, |
| + String signatureAlgorithm, |
| + String signatureData) |
| + : status(status) |
| + , origin(origin) |
| + , version(version) |
| + , logDescription(logDescription) |
| + , logId(logId) |
| + , timestamp(timestamp) |
| + , hashAlgorithm(hashAlgorithm) |
| + , signatureAlgorithm(signatureAlgorithm) |
| + , signatureData(signatureData) |
| + { |
| + } |
| + SignedCertificateTimestamp( |
| + const struct blink::WebURLResponse::SignedCertificateTimestamp&); |
| + String status; |
| + String origin; |
| + String version; |
| + String logDescription; |
| + String logId; |
| + int64_t timestamp; |
| + String hashAlgorithm; |
| + String signatureAlgorithm; |
| + String signatureData; |
| + }; |
| + |
| + using SignedCertificateTimestampList = std::vector<SignedCertificateTimestamp>; |
| + |
| struct SecurityDetails { |
| DISALLOW_NEW(); |
| SecurityDetails() |
| @@ -80,6 +121,7 @@ public: |
| size_t numUnknownSCTs; |
| size_t numInvalidSCTs; |
| size_t numValidSCTs; |
| + SignedCertificateTimestampList sctList; |
| }; |
| class ExtraData : public RefCounted<ExtraData> { |
| @@ -177,7 +219,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; } |