| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2009 Google Inc. All rights reserved. | 3 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 m_downloadedFileHandle = data->m_downloadedFileHandle; | 144 m_downloadedFileHandle = data->m_downloadedFileHandle; |
| 145 | 145 |
| 146 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support | 146 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support |
| 147 // whatever values may be present in the opaque m_extraData structure. | 147 // whatever values may be present in the opaque m_extraData structure. |
| 148 } | 148 } |
| 149 | 149 |
| 150 PassOwnPtr<CrossThreadResourceResponseData> ResourceResponse::copyData() const | 150 PassOwnPtr<CrossThreadResourceResponseData> ResourceResponse::copyData() const |
| 151 { | 151 { |
| 152 OwnPtr<CrossThreadResourceResponseData> data = adoptPtr(new CrossThreadResou
rceResponseData); | 152 OwnPtr<CrossThreadResourceResponseData> data = adoptPtr(new CrossThreadResou
rceResponseData); |
| 153 data->m_url = url().copy(); | 153 data->m_url = url().copy(); |
| 154 data->m_mimeType = mimeType().string().isolatedCopy(); | 154 data->m_mimeType = mimeType().getString().isolatedCopy(); |
| 155 data->m_expectedContentLength = expectedContentLength(); | 155 data->m_expectedContentLength = expectedContentLength(); |
| 156 data->m_textEncodingName = textEncodingName().string().isolatedCopy(); | 156 data->m_textEncodingName = textEncodingName().getString().isolatedCopy(); |
| 157 data->m_suggestedFilename = suggestedFilename().isolatedCopy(); | 157 data->m_suggestedFilename = suggestedFilename().isolatedCopy(); |
| 158 data->m_httpStatusCode = httpStatusCode(); | 158 data->m_httpStatusCode = httpStatusCode(); |
| 159 data->m_httpStatusText = httpStatusText().string().isolatedCopy(); | 159 data->m_httpStatusText = httpStatusText().getString().isolatedCopy(); |
| 160 data->m_httpHeaders = httpHeaderFields().copyData(); | 160 data->m_httpHeaders = httpHeaderFields().copyData(); |
| 161 data->m_lastModifiedDate = lastModifiedDate(); | 161 data->m_lastModifiedDate = lastModifiedDate(); |
| 162 if (m_resourceLoadTiming) | 162 if (m_resourceLoadTiming) |
| 163 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy(); | 163 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy(); |
| 164 data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length(
)); | 164 data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length(
)); |
| 165 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors; | 165 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors; |
| 166 data->m_securityStyle = m_securityStyle; | 166 data->m_securityStyle = m_securityStyle; |
| 167 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy()
; | 167 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy()
; |
| 168 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy(); | 168 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy(); |
| 169 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated
Copy(); | 169 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated
Copy(); |
| 170 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy(); | 170 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy(); |
| 171 data->m_securityDetails.certID = m_securityDetails.certID; | 171 data->m_securityDetails.certID = m_securityDetails.certID; |
| 172 data->m_securityDetails.numUnknownSCTs = m_securityDetails.numUnknownSCTs; | 172 data->m_securityDetails.numUnknownSCTs = m_securityDetails.numUnknownSCTs; |
| 173 data->m_securityDetails.numInvalidSCTs = m_securityDetails.numInvalidSCTs; | 173 data->m_securityDetails.numInvalidSCTs = m_securityDetails.numInvalidSCTs; |
| 174 data->m_securityDetails.numValidSCTs = m_securityDetails.numValidSCTs; | 174 data->m_securityDetails.numValidSCTs = m_securityDetails.numValidSCTs; |
| 175 data->m_httpVersion = m_httpVersion; | 175 data->m_httpVersion = m_httpVersion; |
| 176 data->m_appCacheID = m_appCacheID; | 176 data->m_appCacheID = m_appCacheID; |
| 177 data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); | 177 data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); |
| 178 data->m_multipartBoundary = m_multipartBoundary; | 178 data->m_multipartBoundary = m_multipartBoundary; |
| 179 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY; | 179 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY; |
| 180 data->m_wasNpnNegotiated = m_wasNpnNegotiated; | 180 data->m_wasNpnNegotiated = m_wasNpnNegotiated; |
| 181 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable; | 181 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable; |
| 182 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy; | 182 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy; |
| 183 data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker; | 183 data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker; |
| 184 data->m_wasFallbackRequiredByServiceWorker = m_wasFallbackRequiredByServiceW
orker; | 184 data->m_wasFallbackRequiredByServiceWorker = m_wasFallbackRequiredByServiceW
orker; |
| 185 data->m_serviceWorkerResponseType = m_serviceWorkerResponseType; | 185 data->m_serviceWorkerResponseType = m_serviceWorkerResponseType; |
| 186 data->m_originalURLViaServiceWorker = m_originalURLViaServiceWorker.copy(); | 186 data->m_originalURLViaServiceWorker = m_originalURLViaServiceWorker.copy(); |
| 187 data->m_responseTime = m_responseTime; | 187 data->m_responseTime = m_responseTime; |
| 188 data->m_remoteIPAddress = m_remoteIPAddress.string().isolatedCopy(); | 188 data->m_remoteIPAddress = m_remoteIPAddress.getString().isolatedCopy(); |
| 189 data->m_remotePort = m_remotePort; | 189 data->m_remotePort = m_remotePort; |
| 190 data->m_downloadedFilePath = m_downloadedFilePath.isolatedCopy(); | 190 data->m_downloadedFilePath = m_downloadedFilePath.isolatedCopy(); |
| 191 data->m_downloadedFileHandle = m_downloadedFileHandle; | 191 data->m_downloadedFileHandle = m_downloadedFileHandle; |
| 192 | 192 |
| 193 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support | 193 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support |
| 194 // whatever values may be present in the opaque m_extraData structure. | 194 // whatever values may be present in the opaque m_extraData structure. |
| 195 | 195 |
| 196 return data.release(); | 196 return data.release(); |
| 197 } | 197 } |
| 198 | 198 |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 if (a.httpHeaderFields() != b.httpHeaderFields()) | 567 if (a.httpHeaderFields() != b.httpHeaderFields()) |
| 568 return false; | 568 return false; |
| 569 if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTimin
g() == *b.resourceLoadTiming()) | 569 if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTimin
g() == *b.resourceLoadTiming()) |
| 570 return true; | 570 return true; |
| 571 if (a.resourceLoadTiming() != b.resourceLoadTiming()) | 571 if (a.resourceLoadTiming() != b.resourceLoadTiming()) |
| 572 return false; | 572 return false; |
| 573 return true; | 573 return true; |
| 574 } | 574 } |
| 575 | 575 |
| 576 } // namespace blink | 576 } // namespace blink |
| OLD | NEW |