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

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

Issue 732963003: Use the request URL as the URL of the resources which are fetched ServiceWorker [1/3 blink] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « Source/platform/network/ResourceResponse.h ('k') | public/platform/WebURLResponse.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 response->m_appCacheID = data->m_appCacheID; 118 response->m_appCacheID = data->m_appCacheID;
119 response->m_appCacheManifestURL = data->m_appCacheManifestURL.copy(); 119 response->m_appCacheManifestURL = data->m_appCacheManifestURL.copy();
120 response->m_isMultipartPayload = data->m_isMultipartPayload; 120 response->m_isMultipartPayload = data->m_isMultipartPayload;
121 response->m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY; 121 response->m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY;
122 response->m_wasNpnNegotiated = data->m_wasNpnNegotiated; 122 response->m_wasNpnNegotiated = data->m_wasNpnNegotiated;
123 response->m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvai lable; 123 response->m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvai lable;
124 response->m_wasFetchedViaProxy = data->m_wasFetchedViaProxy; 124 response->m_wasFetchedViaProxy = data->m_wasFetchedViaProxy;
125 response->m_wasFetchedViaServiceWorker = data->m_wasFetchedViaServiceWorker; 125 response->m_wasFetchedViaServiceWorker = data->m_wasFetchedViaServiceWorker;
126 response->m_wasFallbackRequiredByServiceWorker = data->m_wasFallbackRequired ByServiceWorker; 126 response->m_wasFallbackRequiredByServiceWorker = data->m_wasFallbackRequired ByServiceWorker;
127 response->m_serviceWorkerResponseType = data->m_serviceWorkerResponseType; 127 response->m_serviceWorkerResponseType = data->m_serviceWorkerResponseType;
128 response->m_originalURLViaServiceWorker = data->m_originalURLViaServiceWorke r;
128 response->m_responseTime = data->m_responseTime; 129 response->m_responseTime = data->m_responseTime;
129 response->m_remoteIPAddress = AtomicString(data->m_remoteIPAddress); 130 response->m_remoteIPAddress = AtomicString(data->m_remoteIPAddress);
130 response->m_remotePort = data->m_remotePort; 131 response->m_remotePort = data->m_remotePort;
131 response->m_downloadedFilePath = data->m_downloadedFilePath; 132 response->m_downloadedFilePath = data->m_downloadedFilePath;
132 response->m_downloadedFileHandle = data->m_downloadedFileHandle; 133 response->m_downloadedFileHandle = data->m_downloadedFileHandle;
133 134
134 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support 135 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support
135 // whatever values may be present in the opaque m_extraData structure. 136 // whatever values may be present in the opaque m_extraData structure.
136 137
137 return response.release(); 138 return response.release();
(...skipping 18 matching lines...) Expand all
156 data->m_appCacheID = m_appCacheID; 157 data->m_appCacheID = m_appCacheID;
157 data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); 158 data->m_appCacheManifestURL = m_appCacheManifestURL.copy();
158 data->m_isMultipartPayload = m_isMultipartPayload; 159 data->m_isMultipartPayload = m_isMultipartPayload;
159 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY; 160 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY;
160 data->m_wasNpnNegotiated = m_wasNpnNegotiated; 161 data->m_wasNpnNegotiated = m_wasNpnNegotiated;
161 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable; 162 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable;
162 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy; 163 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy;
163 data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker; 164 data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker;
164 data->m_wasFallbackRequiredByServiceWorker = m_wasFallbackRequiredByServiceW orker; 165 data->m_wasFallbackRequiredByServiceWorker = m_wasFallbackRequiredByServiceW orker;
165 data->m_serviceWorkerResponseType = m_serviceWorkerResponseType; 166 data->m_serviceWorkerResponseType = m_serviceWorkerResponseType;
167 data->m_originalURLViaServiceWorker = m_originalURLViaServiceWorker;
166 data->m_responseTime = m_responseTime; 168 data->m_responseTime = m_responseTime;
167 data->m_remoteIPAddress = m_remoteIPAddress.string().isolatedCopy(); 169 data->m_remoteIPAddress = m_remoteIPAddress.string().isolatedCopy();
168 data->m_remotePort = m_remotePort; 170 data->m_remotePort = m_remotePort;
169 data->m_downloadedFilePath = m_downloadedFilePath.isolatedCopy(); 171 data->m_downloadedFilePath = m_downloadedFilePath.isolatedCopy();
170 data->m_downloadedFileHandle = m_downloadedFileHandle; 172 data->m_downloadedFileHandle = m_downloadedFileHandle;
171 173
172 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support 174 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support
173 // whatever values may be present in the opaque m_extraData structure. 175 // whatever values may be present in the opaque m_extraData structure.
174 176
175 return data.release(); 177 return data.release();
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 if (a.httpHeaderFields() != b.httpHeaderFields()) 534 if (a.httpHeaderFields() != b.httpHeaderFields())
533 return false; 535 return false;
534 if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTimin g() == *b.resourceLoadTiming()) 536 if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTimin g() == *b.resourceLoadTiming())
535 return true; 537 return true;
536 if (a.resourceLoadTiming() != b.resourceLoadTiming()) 538 if (a.resourceLoadTiming() != b.resourceLoadTiming())
537 return false; 539 return false;
538 return true; 540 return true;
539 } 541 }
540 542
541 } 543 }
OLDNEW
« no previous file with comments | « Source/platform/network/ResourceResponse.h ('k') | public/platform/WebURLResponse.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698