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

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

Issue 653373002: [ServiceWorker] pipe ServiceWorkerResponseType [1/2 blink] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 , m_lastModified(0.0) 50 , m_lastModified(0.0)
51 , m_httpVersion(Unknown) 51 , m_httpVersion(Unknown)
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_responseTime(0) 61 , m_responseTime(0)
61 , m_remotePort(0) 62 , m_remotePort(0)
62 { 63 {
63 } 64 }
64 65
65 ResourceResponse::ResourceResponse(const KURL& url, const AtomicString& mimeType , long long expectedLength, const AtomicString& textEncodingName, const String& filename) 66 ResourceResponse::ResourceResponse(const KURL& url, const AtomicString& mimeType , long long expectedLength, const AtomicString& textEncodingName, const String& filename)
66 : m_url(url) 67 : m_url(url)
67 , m_mimeType(mimeType) 68 , m_mimeType(mimeType)
68 , m_expectedContentLength(expectedLength) 69 , m_expectedContentLength(expectedLength)
69 , m_textEncodingName(textEncodingName) 70 , m_textEncodingName(textEncodingName)
(...skipping 14 matching lines...) Expand all
84 , m_lastModified(0.0) 85 , m_lastModified(0.0)
85 , m_httpVersion(Unknown) 86 , m_httpVersion(Unknown)
86 , m_appCacheID(0) 87 , m_appCacheID(0)
87 , m_isMultipartPayload(false) 88 , m_isMultipartPayload(false)
88 , m_wasFetchedViaSPDY(false) 89 , m_wasFetchedViaSPDY(false)
89 , m_wasNpnNegotiated(false) 90 , m_wasNpnNegotiated(false)
90 , m_wasAlternateProtocolAvailable(false) 91 , m_wasAlternateProtocolAvailable(false)
91 , m_wasFetchedViaProxy(false) 92 , m_wasFetchedViaProxy(false)
92 , m_wasFetchedViaServiceWorker(false) 93 , m_wasFetchedViaServiceWorker(false)
93 , m_wasFallbackRequiredByServiceWorker(false) 94 , m_wasFallbackRequiredByServiceWorker(false)
95 , m_serviceWorkerResponseType(WebServiceWorkerResponseTypeDefault)
94 , m_responseTime(0) 96 , m_responseTime(0)
95 , m_remotePort(0) 97 , m_remotePort(0)
96 { 98 {
97 } 99 }
98 100
99 PassOwnPtr<ResourceResponse> ResourceResponse::adopt(PassOwnPtr<CrossThreadResou rceResponseData> data) 101 PassOwnPtr<ResourceResponse> ResourceResponse::adopt(PassOwnPtr<CrossThreadResou rceResponseData> data)
100 { 102 {
101 OwnPtr<ResourceResponse> response = adoptPtr(new ResourceResponse); 103 OwnPtr<ResourceResponse> response = adoptPtr(new ResourceResponse);
102 response->setURL(data->m_url); 104 response->setURL(data->m_url);
103 response->setMimeType(AtomicString(data->m_mimeType)); 105 response->setMimeType(AtomicString(data->m_mimeType));
(...skipping 11 matching lines...) Expand all
115 response->m_httpVersion = data->m_httpVersion; 117 response->m_httpVersion = data->m_httpVersion;
116 response->m_appCacheID = data->m_appCacheID; 118 response->m_appCacheID = data->m_appCacheID;
117 response->m_appCacheManifestURL = data->m_appCacheManifestURL.copy(); 119 response->m_appCacheManifestURL = data->m_appCacheManifestURL.copy();
118 response->m_isMultipartPayload = data->m_isMultipartPayload; 120 response->m_isMultipartPayload = data->m_isMultipartPayload;
119 response->m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY; 121 response->m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY;
120 response->m_wasNpnNegotiated = data->m_wasNpnNegotiated; 122 response->m_wasNpnNegotiated = data->m_wasNpnNegotiated;
121 response->m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvai lable; 123 response->m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvai lable;
122 response->m_wasFetchedViaProxy = data->m_wasFetchedViaProxy; 124 response->m_wasFetchedViaProxy = data->m_wasFetchedViaProxy;
123 response->m_wasFetchedViaServiceWorker = data->m_wasFetchedViaServiceWorker; 125 response->m_wasFetchedViaServiceWorker = data->m_wasFetchedViaServiceWorker;
124 response->m_wasFallbackRequiredByServiceWorker = data->m_wasFallbackRequired ByServiceWorker; 126 response->m_wasFallbackRequiredByServiceWorker = data->m_wasFallbackRequired ByServiceWorker;
127 response->m_serviceWorkerResponseType = data->m_serviceWorkerResponseType;
125 response->m_responseTime = data->m_responseTime; 128 response->m_responseTime = data->m_responseTime;
126 response->m_remoteIPAddress = AtomicString(data->m_remoteIPAddress); 129 response->m_remoteIPAddress = AtomicString(data->m_remoteIPAddress);
127 response->m_remotePort = data->m_remotePort; 130 response->m_remotePort = data->m_remotePort;
128 response->m_downloadedFilePath = data->m_downloadedFilePath; 131 response->m_downloadedFilePath = data->m_downloadedFilePath;
129 response->m_downloadedFileHandle = data->m_downloadedFileHandle; 132 response->m_downloadedFileHandle = data->m_downloadedFileHandle;
130 133
131 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support 134 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support
132 // whatever values may be present in the opaque m_extraData structure. 135 // whatever values may be present in the opaque m_extraData structure.
133 136
134 return response.release(); 137 return response.release();
(...skipping 17 matching lines...) Expand all
152 data->m_httpVersion = m_httpVersion; 155 data->m_httpVersion = m_httpVersion;
153 data->m_appCacheID = m_appCacheID; 156 data->m_appCacheID = m_appCacheID;
154 data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); 157 data->m_appCacheManifestURL = m_appCacheManifestURL.copy();
155 data->m_isMultipartPayload = m_isMultipartPayload; 158 data->m_isMultipartPayload = m_isMultipartPayload;
156 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY; 159 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY;
157 data->m_wasNpnNegotiated = m_wasNpnNegotiated; 160 data->m_wasNpnNegotiated = m_wasNpnNegotiated;
158 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable; 161 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable;
159 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy; 162 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy;
160 data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker; 163 data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker;
161 data->m_wasFallbackRequiredByServiceWorker = m_wasFallbackRequiredByServiceW orker; 164 data->m_wasFallbackRequiredByServiceWorker = m_wasFallbackRequiredByServiceW orker;
165 data->m_serviceWorkerResponseType = m_serviceWorkerResponseType;
162 data->m_responseTime = m_responseTime; 166 data->m_responseTime = m_responseTime;
163 data->m_remoteIPAddress = m_remoteIPAddress.string().isolatedCopy(); 167 data->m_remoteIPAddress = m_remoteIPAddress.string().isolatedCopy();
164 data->m_remotePort = m_remotePort; 168 data->m_remotePort = m_remotePort;
165 data->m_downloadedFilePath = m_downloadedFilePath.isolatedCopy(); 169 data->m_downloadedFilePath = m_downloadedFilePath.isolatedCopy();
166 data->m_downloadedFileHandle = m_downloadedFileHandle; 170 data->m_downloadedFileHandle = m_downloadedFileHandle;
167 171
168 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support 172 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support
169 // whatever values may be present in the opaque m_extraData structure. 173 // whatever values may be present in the opaque m_extraData structure.
170 174
171 return data.release(); 175 return data.release();
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 if (a.httpHeaderFields() != b.httpHeaderFields()) 532 if (a.httpHeaderFields() != b.httpHeaderFields())
529 return false; 533 return false;
530 if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTimin g() == *b.resourceLoadTiming()) 534 if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTimin g() == *b.resourceLoadTiming())
531 return true; 535 return true;
532 if (a.resourceLoadTiming() != b.resourceLoadTiming()) 536 if (a.resourceLoadTiming() != b.resourceLoadTiming())
533 return false; 537 return false;
534 return true; 538 return true;
535 } 539 }
536 540
537 } 541 }
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