| 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 | 161 |
| 162 m_httpHeaderFields.adopt(std::move(data->m_httpHeaders)); | 162 m_httpHeaderFields.adopt(std::move(data->m_httpHeaders)); |
| 163 setLastModifiedDate(data->m_lastModifiedDate); | 163 setLastModifiedDate(data->m_lastModifiedDate); |
| 164 setResourceLoadTiming(data->m_resourceLoadTiming.release()); | 164 setResourceLoadTiming(data->m_resourceLoadTiming.release()); |
| 165 m_securityInfo = data->m_securityInfo; | 165 m_securityInfo = data->m_securityInfo; |
| 166 m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors; | 166 m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors; |
| 167 m_securityStyle = data->m_securityStyle; | 167 m_securityStyle = data->m_securityStyle; |
| 168 m_securityDetails.protocol = data->m_securityDetails.protocol; | 168 m_securityDetails.protocol = data->m_securityDetails.protocol; |
| 169 m_securityDetails.cipher = data->m_securityDetails.cipher; | 169 m_securityDetails.cipher = data->m_securityDetails.cipher; |
| 170 m_securityDetails.keyExchange = data->m_securityDetails.keyExchange; | 170 m_securityDetails.keyExchange = data->m_securityDetails.keyExchange; |
| 171 m_securityDetails.keyExchangeGroup = data->m_securityDetails.keyExchangeGrou
p; |
| 171 m_securityDetails.mac = data->m_securityDetails.mac; | 172 m_securityDetails.mac = data->m_securityDetails.mac; |
| 172 m_securityDetails.certID = data->m_securityDetails.certID; | 173 m_securityDetails.certID = data->m_securityDetails.certID; |
| 173 m_securityDetails.sctList = data->m_securityDetails.sctList; | 174 m_securityDetails.sctList = data->m_securityDetails.sctList; |
| 174 m_httpVersion = data->m_httpVersion; | 175 m_httpVersion = data->m_httpVersion; |
| 175 m_appCacheID = data->m_appCacheID; | 176 m_appCacheID = data->m_appCacheID; |
| 176 m_appCacheManifestURL = data->m_appCacheManifestURL.copy(); | 177 m_appCacheManifestURL = data->m_appCacheManifestURL.copy(); |
| 177 m_multipartBoundary = data->m_multipartBoundary; | 178 m_multipartBoundary = data->m_multipartBoundary; |
| 178 m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY; | 179 m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY; |
| 179 m_wasNpnNegotiated = data->m_wasNpnNegotiated; | 180 m_wasNpnNegotiated = data->m_wasNpnNegotiated; |
| 180 m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvailable; | 181 m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvailable; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 data->m_httpHeaders = httpHeaderFields().copyData(); | 214 data->m_httpHeaders = httpHeaderFields().copyData(); |
| 214 data->m_lastModifiedDate = lastModifiedDate(); | 215 data->m_lastModifiedDate = lastModifiedDate(); |
| 215 if (m_resourceLoadTiming) | 216 if (m_resourceLoadTiming) |
| 216 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy(); | 217 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy(); |
| 217 data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length(
)); | 218 data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length(
)); |
| 218 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors; | 219 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors; |
| 219 data->m_securityStyle = m_securityStyle; | 220 data->m_securityStyle = m_securityStyle; |
| 220 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy()
; | 221 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy()
; |
| 221 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy(); | 222 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy(); |
| 222 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated
Copy(); | 223 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated
Copy(); |
| 224 data->m_securityDetails.keyExchangeGroup = m_securityDetails.keyExchangeGrou
p.isolatedCopy(); |
| 223 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy(); | 225 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy(); |
| 224 data->m_securityDetails.certID = m_securityDetails.certID; | 226 data->m_securityDetails.certID = m_securityDetails.certID; |
| 225 data->m_securityDetails.sctList = isolatedCopy(m_securityDetails.sctList); | 227 data->m_securityDetails.sctList = isolatedCopy(m_securityDetails.sctList); |
| 226 data->m_httpVersion = m_httpVersion; | 228 data->m_httpVersion = m_httpVersion; |
| 227 data->m_appCacheID = m_appCacheID; | 229 data->m_appCacheID = m_appCacheID; |
| 228 data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); | 230 data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); |
| 229 data->m_multipartBoundary = m_multipartBoundary; | 231 data->m_multipartBoundary = m_multipartBoundary; |
| 230 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY; | 232 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY; |
| 231 data->m_wasNpnNegotiated = m_wasNpnNegotiated; | 233 data->m_wasNpnNegotiated = m_wasNpnNegotiated; |
| 232 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable; | 234 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable; |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 else if (equalIgnoringCase(name, cacheControlHeaderString()) || equalIgnorin
gCase(name, pragmaHeaderString())) | 372 else if (equalIgnoringCase(name, cacheControlHeaderString()) || equalIgnorin
gCase(name, pragmaHeaderString())) |
| 371 m_cacheControlHeader = CacheControlHeader(); | 373 m_cacheControlHeader = CacheControlHeader(); |
| 372 else if (equalIgnoringCase(name, dateHeader)) | 374 else if (equalIgnoringCase(name, dateHeader)) |
| 373 m_haveParsedDateHeader = false; | 375 m_haveParsedDateHeader = false; |
| 374 else if (equalIgnoringCase(name, expiresHeader)) | 376 else if (equalIgnoringCase(name, expiresHeader)) |
| 375 m_haveParsedExpiresHeader = false; | 377 m_haveParsedExpiresHeader = false; |
| 376 else if (equalIgnoringCase(name, lastModifiedHeader)) | 378 else if (equalIgnoringCase(name, lastModifiedHeader)) |
| 377 m_haveParsedLastModifiedHeader = false; | 379 m_haveParsedLastModifiedHeader = false; |
| 378 } | 380 } |
| 379 | 381 |
| 380 void ResourceResponse::setSecurityDetails(const String& protocol, const String&
keyExchange, const String& cipher, const String& mac, int certId, const SignedCe
rtificateTimestampList& sctList) | 382 void ResourceResponse::setSecurityDetails(const String& protocol, const String&
keyExchange, const String& keyExchangeGroup, const String& cipher, const String&
mac, int certId, const SignedCertificateTimestampList& sctList) |
| 381 { | 383 { |
| 382 m_securityDetails.protocol = protocol; | 384 m_securityDetails.protocol = protocol; |
| 383 m_securityDetails.keyExchange = keyExchange; | 385 m_securityDetails.keyExchange = keyExchange; |
| 386 m_securityDetails.keyExchangeGroup = keyExchangeGroup; |
| 384 m_securityDetails.cipher = cipher; | 387 m_securityDetails.cipher = cipher; |
| 385 m_securityDetails.mac = mac; | 388 m_securityDetails.mac = mac; |
| 386 m_securityDetails.certID = certId; | 389 m_securityDetails.certID = certId; |
| 387 m_securityDetails.sctList = sctList; | 390 m_securityDetails.sctList = sctList; |
| 388 } | 391 } |
| 389 | 392 |
| 390 void ResourceResponse::setHTTPHeaderField(const AtomicString& name, const Atomic
String& value) | 393 void ResourceResponse::setHTTPHeaderField(const AtomicString& name, const Atomic
String& value) |
| 391 { | 394 { |
| 392 updateHeaderParsedState(name); | 395 updateHeaderParsedState(name); |
| 393 | 396 |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 if (a.resourceLoadTiming() != b.resourceLoadTiming()) | 637 if (a.resourceLoadTiming() != b.resourceLoadTiming()) |
| 635 return false; | 638 return false; |
| 636 if (a.encodedBodyLength() != b.encodedBodyLength()) | 639 if (a.encodedBodyLength() != b.encodedBodyLength()) |
| 637 return false; | 640 return false; |
| 638 if (a.decodedBodyLength() != b.decodedBodyLength()) | 641 if (a.decodedBodyLength() != b.decodedBodyLength()) |
| 639 return false; | 642 return false; |
| 640 return true; | 643 return true; |
| 641 } | 644 } |
| 642 | 645 |
| 643 } // namespace blink | 646 } // namespace blink |
| OLD | NEW |