Implement SignedCertificateTimestamp::isolatedCopy

third_party/WebKit/Source/platform/network/ResourceResponse.cpp

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 d1a85c9ad9916f056f8f7d425d27d13f3060fd51..ef78ccb2bd287ed951d48ffdbacd2d16c76ebc41 100644
--- a/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
+++ b/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
@@ -33,6 +33,20 @@
 
 namespace blink {
 
+namespace {
+
+Vector<ResourceResponse::SignedCertificateTimestamp> isolatedCopy(const Vector<ResourceResponse::SignedCertificateTimestamp>& src)
+{
+    Vector<ResourceResponse::SignedCertificateTimestamp> result;
+    result.reserveCapacity(src.size());
+    for (const auto& timestamp : src) {
+        result.append(timestamp.isolatedCopy());
+    }
+    return result;
+}
+
+} // namespace
+
 ResourceResponse::SignedCertificateTimestamp::SignedCertificateTimestamp(
     const blink::WebURLResponse::SignedCertificateTimestamp& sct)
     : m_status(sct.status)
@@ -46,6 +60,19 @@ ResourceResponse::SignedCertificateTimestamp::SignedCertificateTimestamp(
 {
 }
 
+ResourceResponse::SignedCertificateTimestamp ResourceResponse::SignedCertificateTimestamp::isolatedCopy() const
+{
+    return SignedCertificateTimestamp(
+        m_status.isolatedCopy(),
+        m_origin.isolatedCopy(),
+        m_logDescription.isolatedCopy(),
+        m_logId.isolatedCopy(),
+        m_timestamp,
+        m_hashAlgorithm.isolatedCopy(),
+        m_signatureAlgorithm.isolatedCopy(),
+        m_signatureData.isolatedCopy());
+}
+
 ResourceResponse::ResourceResponse()
     : m_expectedContentLength(0)
     , m_httpStatusCode(0)
@@ -140,7 +167,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_securityDetails.sctList = isolatedCopy(data->m_securityDetails.sctList);

[hiroshige, 2016/07/11 10:09:45]

This isolatedCopy() is not necessary because this is called after crossing the
thread boundary and we can use |*this| and |*data| freely on the target thread.

[yhirano, 2016/07/12 05:14:42]

Thanks, done.

     m_httpVersion = data->m_httpVersion;
     m_appCacheID = data->m_appCacheID;
     m_appCacheManifestURL = data->m_appCacheManifestURL.copy();
@@ -189,7 +216,7 @@ std::unique_ptr<CrossThreadResourceResponseData> ResourceResponse::copyData() co
     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_securityDetails.sctList = isolatedCopy(m_securityDetails.sctList);
     data->m_httpVersion = m_httpVersion;
     data->m_appCacheID = m_appCacheID;
     data->m_appCacheManifestURL = m_appCacheManifestURL.copy();