OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google, Inc. | 2 * Copyright (C) 2012 Google, Inc. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
12 * | 12 * |
(...skipping 10 matching lines...) Expand all Loading... |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "ResourceResponse.h" | 27 #include "ResourceResponse.h" |
28 | 28 |
29 namespace WebCore { | 29 namespace WebCore { |
30 | 30 |
31 PassOwnPtr<CrossThreadResourceResponseData> ResourceResponse::doPlatformCopyData
(PassOwnPtr<CrossThreadResourceResponseData> data) const | 31 PassOwnPtr<CrossThreadResourceResponseData> ResourceResponse::doPlatformCopyData
(PassOwnPtr<CrossThreadResourceResponseData> data) const |
32 { | 32 { |
| 33 data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length(
)); |
| 34 data->m_httpVersion = m_httpVersion; |
33 data->m_appCacheID = m_appCacheID; | 35 data->m_appCacheID = m_appCacheID; |
34 data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); | 36 data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); |
35 data->m_isMultipartPayload = m_isMultipartPayload; | 37 data->m_isMultipartPayload = m_isMultipartPayload; |
36 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY; | 38 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY; |
37 data->m_wasNpnNegotiated = m_wasNpnNegotiated; | 39 data->m_wasNpnNegotiated = m_wasNpnNegotiated; |
38 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable; | 40 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable; |
39 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy; | 41 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy; |
40 data->m_responseTime = m_responseTime; | 42 data->m_responseTime = m_responseTime; |
41 data->m_remoteIPAddress = m_remoteIPAddress; | 43 data->m_remoteIPAddress = m_remoteIPAddress.isolatedCopy(); |
42 data->m_remotePort = m_remotePort; | 44 data->m_remotePort = m_remotePort; |
43 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support m_
downloadedFile. | 45 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support m_
downloadedFile, |
| 46 // or whatever values may be present in the opaque m_extraData structure. |
44 return data; | 47 return data; |
45 } | 48 } |
46 | 49 |
47 void ResourceResponse::doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseDat
a> data) | 50 void ResourceResponse::doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseDat
a> data) |
48 { | 51 { |
| 52 m_securityInfo = data->m_securityInfo; |
| 53 m_httpVersion = data->m_httpVersion; |
49 m_appCacheID = data->m_appCacheID; | 54 m_appCacheID = data->m_appCacheID; |
50 m_appCacheManifestURL = data->m_appCacheManifestURL.copy(); | 55 m_appCacheManifestURL = data->m_appCacheManifestURL.copy(); |
51 m_isMultipartPayload = data->m_isMultipartPayload; | 56 m_isMultipartPayload = data->m_isMultipartPayload; |
52 m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY; | 57 m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY; |
53 m_wasNpnNegotiated = data->m_wasNpnNegotiated; | 58 m_wasNpnNegotiated = data->m_wasNpnNegotiated; |
54 m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvailable; | 59 m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvailable; |
55 m_wasFetchedViaProxy = data->m_wasFetchedViaProxy; | 60 m_wasFetchedViaProxy = data->m_wasFetchedViaProxy; |
56 m_responseTime = data->m_responseTime; | 61 m_responseTime = data->m_responseTime; |
57 m_remoteIPAddress = data->m_remoteIPAddress; | 62 m_remoteIPAddress = data->m_remoteIPAddress; |
58 m_remotePort = data->m_remotePort; | 63 m_remotePort = data->m_remotePort; |
59 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support m_
downloadedFile. | 64 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support m_
downloadedFile, |
| 65 // or whatever values may be present in the opaque m_extraData structure. |
60 } | 66 } |
61 | 67 |
62 } // namespace WebCore | 68 } // namespace WebCore |
OLD | NEW |