| 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 bb4e0924e10aa8a3356f0766526154bcda5b716d..33ff53910c8b15db830f2176d8878b59c1399725 100644
|
| --- a/third_party/WebKit/Source/platform/network/ResourceResponse.h
|
| +++ b/third_party/WebKit/Source/platform/network/ResourceResponse.h
|
| @@ -34,11 +34,14 @@
|
| #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/RefPtr.h"
|
| #include "wtf/text/CString.h"
|
|
|
| +#include <vector>
|
| +
|
| namespace blink {
|
|
|
| struct CrossThreadResourceResponseData;
|
| @@ -59,6 +62,45 @@ 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()
|
| @@ -79,6 +121,7 @@ public:
|
| size_t numUnknownSCTs;
|
| size_t numInvalidSCTs;
|
| size_t numValidSCTs;
|
| + SignedCertificateTimestampList sctList;
|
| };
|
|
|
| class ExtraData : public RefCounted<ExtraData> {
|
| @@ -176,7 +219,7 @@ public:
|
| void setSecurityStyle(SecurityStyle securityStyle) { m_securityStyle = securityStyle; }
|
|
|
| const SecurityDetails* securityDetails() 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; }
|
|
|