Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Side by Side Diff: Source/platform/network/ResourceResponse.cpp

Issue 938643002: Preserve original int64 time stamp in ResourceResponse. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use long long Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 , m_appCacheID(0) 52 , m_appCacheID(0)
53 , m_isMultipartPayload(false) 53 , m_isMultipartPayload(false)
54 , m_wasFetchedViaSPDY(false) 54 , m_wasFetchedViaSPDY(false)
55 , m_wasNpnNegotiated(false) 55 , m_wasNpnNegotiated(false)
56 , m_wasAlternateProtocolAvailable(false) 56 , m_wasAlternateProtocolAvailable(false)
57 , m_wasFetchedViaProxy(false) 57 , m_wasFetchedViaProxy(false)
58 , m_wasFetchedViaServiceWorker(false) 58 , m_wasFetchedViaServiceWorker(false)
59 , m_wasFallbackRequiredByServiceWorker(false) 59 , m_wasFallbackRequiredByServiceWorker(false)
60 , m_serviceWorkerResponseType(WebServiceWorkerResponseTypeDefault) 60 , m_serviceWorkerResponseType(WebServiceWorkerResponseTypeDefault)
61 , m_responseTime(0) 61 , m_responseTime(0)
62 , m_originalResponseTime(0)
62 , m_remotePort(0) 63 , m_remotePort(0)
63 { 64 {
64 } 65 }
65 66
66 ResourceResponse::ResourceResponse(const KURL& url, const AtomicString& mimeType , long long expectedLength, const AtomicString& textEncodingName, const String& filename) 67 ResourceResponse::ResourceResponse(const KURL& url, const AtomicString& mimeType , long long expectedLength, const AtomicString& textEncodingName, const String& filename)
67 : m_url(url) 68 : m_url(url)
68 , m_mimeType(mimeType) 69 , m_mimeType(mimeType)
69 , m_expectedContentLength(expectedLength) 70 , m_expectedContentLength(expectedLength)
70 , m_textEncodingName(textEncodingName) 71 , m_textEncodingName(textEncodingName)
71 , m_suggestedFilename(filename) 72 , m_suggestedFilename(filename)
(...skipping 15 matching lines...) Expand all
87 , m_appCacheID(0) 88 , m_appCacheID(0)
88 , m_isMultipartPayload(false) 89 , m_isMultipartPayload(false)
89 , m_wasFetchedViaSPDY(false) 90 , m_wasFetchedViaSPDY(false)
90 , m_wasNpnNegotiated(false) 91 , m_wasNpnNegotiated(false)
91 , m_wasAlternateProtocolAvailable(false) 92 , m_wasAlternateProtocolAvailable(false)
92 , m_wasFetchedViaProxy(false) 93 , m_wasFetchedViaProxy(false)
93 , m_wasFetchedViaServiceWorker(false) 94 , m_wasFetchedViaServiceWorker(false)
94 , m_wasFallbackRequiredByServiceWorker(false) 95 , m_wasFallbackRequiredByServiceWorker(false)
95 , m_serviceWorkerResponseType(WebServiceWorkerResponseTypeDefault) 96 , m_serviceWorkerResponseType(WebServiceWorkerResponseTypeDefault)
96 , m_responseTime(0) 97 , m_responseTime(0)
98 , m_originalResponseTime(0)
97 , m_remotePort(0) 99 , m_remotePort(0)
98 { 100 {
99 } 101 }
100 102
101 PassOwnPtr<ResourceResponse> ResourceResponse::adopt(PassOwnPtr<CrossThreadResou rceResponseData> data) 103 PassOwnPtr<ResourceResponse> ResourceResponse::adopt(PassOwnPtr<CrossThreadResou rceResponseData> data)
102 { 104 {
103 OwnPtr<ResourceResponse> response = adoptPtr(new ResourceResponse); 105 OwnPtr<ResourceResponse> response = adoptPtr(new ResourceResponse);
104 response->setURL(data->m_url); 106 response->setURL(data->m_url);
105 response->setMimeType(AtomicString(data->m_mimeType)); 107 response->setMimeType(AtomicString(data->m_mimeType));
106 response->setExpectedContentLength(data->m_expectedContentLength); 108 response->setExpectedContentLength(data->m_expectedContentLength);
(...skipping 13 matching lines...) Expand all
120 response->m_isMultipartPayload = data->m_isMultipartPayload; 122 response->m_isMultipartPayload = data->m_isMultipartPayload;
121 response->m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY; 123 response->m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY;
122 response->m_wasNpnNegotiated = data->m_wasNpnNegotiated; 124 response->m_wasNpnNegotiated = data->m_wasNpnNegotiated;
123 response->m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvai lable; 125 response->m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvai lable;
124 response->m_wasFetchedViaProxy = data->m_wasFetchedViaProxy; 126 response->m_wasFetchedViaProxy = data->m_wasFetchedViaProxy;
125 response->m_wasFetchedViaServiceWorker = data->m_wasFetchedViaServiceWorker; 127 response->m_wasFetchedViaServiceWorker = data->m_wasFetchedViaServiceWorker;
126 response->m_wasFallbackRequiredByServiceWorker = data->m_wasFallbackRequired ByServiceWorker; 128 response->m_wasFallbackRequiredByServiceWorker = data->m_wasFallbackRequired ByServiceWorker;
127 response->m_serviceWorkerResponseType = data->m_serviceWorkerResponseType; 129 response->m_serviceWorkerResponseType = data->m_serviceWorkerResponseType;
128 response->m_originalURLViaServiceWorker = data->m_originalURLViaServiceWorke r; 130 response->m_originalURLViaServiceWorker = data->m_originalURLViaServiceWorke r;
129 response->m_responseTime = data->m_responseTime; 131 response->m_responseTime = data->m_responseTime;
132 response->m_originalResponseTime = data->m_originalResponseTime;
130 response->m_remoteIPAddress = AtomicString(data->m_remoteIPAddress); 133 response->m_remoteIPAddress = AtomicString(data->m_remoteIPAddress);
131 response->m_remotePort = data->m_remotePort; 134 response->m_remotePort = data->m_remotePort;
132 response->m_downloadedFilePath = data->m_downloadedFilePath; 135 response->m_downloadedFilePath = data->m_downloadedFilePath;
133 response->m_downloadedFileHandle = data->m_downloadedFileHandle; 136 response->m_downloadedFileHandle = data->m_downloadedFileHandle;
134 137
135 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support 138 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support
136 // whatever values may be present in the opaque m_extraData structure. 139 // whatever values may be present in the opaque m_extraData structure.
137 140
138 return response.release(); 141 return response.release();
139 } 142 }
(...skipping 19 matching lines...) Expand all
159 data->m_isMultipartPayload = m_isMultipartPayload; 162 data->m_isMultipartPayload = m_isMultipartPayload;
160 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY; 163 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY;
161 data->m_wasNpnNegotiated = m_wasNpnNegotiated; 164 data->m_wasNpnNegotiated = m_wasNpnNegotiated;
162 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable; 165 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable;
163 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy; 166 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy;
164 data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker; 167 data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker;
165 data->m_wasFallbackRequiredByServiceWorker = m_wasFallbackRequiredByServiceW orker; 168 data->m_wasFallbackRequiredByServiceWorker = m_wasFallbackRequiredByServiceW orker;
166 data->m_serviceWorkerResponseType = m_serviceWorkerResponseType; 169 data->m_serviceWorkerResponseType = m_serviceWorkerResponseType;
167 data->m_originalURLViaServiceWorker = m_originalURLViaServiceWorker; 170 data->m_originalURLViaServiceWorker = m_originalURLViaServiceWorker;
168 data->m_responseTime = m_responseTime; 171 data->m_responseTime = m_responseTime;
172 data->m_originalResponseTime = m_originalResponseTime;
169 data->m_remoteIPAddress = m_remoteIPAddress.string().isolatedCopy(); 173 data->m_remoteIPAddress = m_remoteIPAddress.string().isolatedCopy();
170 data->m_remotePort = m_remotePort; 174 data->m_remotePort = m_remotePort;
171 data->m_downloadedFilePath = m_downloadedFilePath.isolatedCopy(); 175 data->m_downloadedFilePath = m_downloadedFilePath.isolatedCopy();
172 data->m_downloadedFileHandle = m_downloadedFileHandle; 176 data->m_downloadedFileHandle = m_downloadedFileHandle;
173 177
174 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support 178 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support
175 // whatever values may be present in the opaque m_extraData structure. 179 // whatever values may be present in the opaque m_extraData structure.
176 180
177 return data.release(); 181 return data.release();
178 } 182 }
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 if (a.httpHeaderFields() != b.httpHeaderFields()) 538 if (a.httpHeaderFields() != b.httpHeaderFields())
535 return false; 539 return false;
536 if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTimin g() == *b.resourceLoadTiming()) 540 if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTimin g() == *b.resourceLoadTiming())
537 return true; 541 return true;
538 if (a.resourceLoadTiming() != b.resourceLoadTiming()) 542 if (a.resourceLoadTiming() != b.resourceLoadTiming())
539 return false; 543 return false;
540 return true; 544 return true;
541 } 545 }
542 546
543 } 547 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698