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

Side by Side Diff: third_party/WebKit/Source/modules/fetch/FetchResponseData.cpp

Issue 2804023004: Replace ASSERT with DCHECK in modules/fetch. (Closed)
Patch Set: Created 3 years, 8 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/fetch/FetchResponseData.h" 5 #include "modules/fetch/FetchResponseData.h"
6 6
7 #include "bindings/core/v8/ScriptState.h" 7 #include "bindings/core/v8/ScriptState.h"
8 #include "core/dom/DOMArrayBuffer.h" 8 #include "core/dom/DOMArrayBuffer.h"
9 #include "modules/fetch/BodyStreamBuffer.h" 9 #include "modules/fetch/BodyStreamBuffer.h"
10 #include "modules/fetch/FetchHeaderList.h" 10 #include "modules/fetch/FetchHeaderList.h"
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 newResponse->m_statusMessage = m_statusMessage; 213 newResponse->m_statusMessage = m_statusMessage;
214 newResponse->m_headerList = m_headerList->clone(); 214 newResponse->m_headerList = m_headerList->clone();
215 newResponse->m_mimeType = m_mimeType; 215 newResponse->m_mimeType = m_mimeType;
216 newResponse->m_responseTime = m_responseTime; 216 newResponse->m_responseTime = m_responseTime;
217 newResponse->m_cacheStorageCacheName = m_cacheStorageCacheName; 217 newResponse->m_cacheStorageCacheName = m_cacheStorageCacheName;
218 newResponse->m_corsExposedHeaderNames = m_corsExposedHeaderNames; 218 newResponse->m_corsExposedHeaderNames = m_corsExposedHeaderNames;
219 219
220 switch (m_type) { 220 switch (m_type) {
221 case BasicType: 221 case BasicType:
222 case CORSType: 222 case CORSType:
223 ASSERT(m_internalResponse); 223 DCHECK(m_internalResponse);
224 ASSERT(m_buffer == m_internalResponse->m_buffer); 224 DCHECK(m_buffer == m_internalResponse->m_buffer);
tkent 2017/04/08 02:29:54 Use DCHECK_EQ if it doesn't cause a build failure.
225 ASSERT(m_internalResponse->m_type == DefaultType); 225 DCHECK(m_internalResponse->m_type == DefaultType);
tkent 2017/04/08 02:29:54 Use DCHECK_EQ if it doesn't cause a build failure.
226 newResponse->m_internalResponse = m_internalResponse->clone(scriptState); 226 newResponse->m_internalResponse = m_internalResponse->clone(scriptState);
227 m_buffer = m_internalResponse->m_buffer; 227 m_buffer = m_internalResponse->m_buffer;
228 newResponse->m_buffer = newResponse->m_internalResponse->m_buffer; 228 newResponse->m_buffer = newResponse->m_internalResponse->m_buffer;
229 break; 229 break;
230 case DefaultType: { 230 case DefaultType: {
231 ASSERT(!m_internalResponse); 231 DCHECK(!m_internalResponse);
232 if (m_buffer) { 232 if (m_buffer) {
233 BodyStreamBuffer* new1 = nullptr; 233 BodyStreamBuffer* new1 = nullptr;
234 BodyStreamBuffer* new2 = nullptr; 234 BodyStreamBuffer* new2 = nullptr;
235 m_buffer->tee(&new1, &new2); 235 m_buffer->tee(&new1, &new2);
236 m_buffer = new1; 236 m_buffer = new1;
237 newResponse->m_buffer = new2; 237 newResponse->m_buffer = new2;
238 } 238 }
239 break; 239 break;
240 } 240 }
241 case ErrorType: 241 case ErrorType:
242 ASSERT(!m_internalResponse); 242 DCHECK(!m_internalResponse);
243 ASSERT(!m_buffer); 243 DCHECK(!m_buffer);
244 break; 244 break;
245 case OpaqueType: 245 case OpaqueType:
246 case OpaqueRedirectType: 246 case OpaqueRedirectType:
247 ASSERT(m_internalResponse); 247 DCHECK(m_internalResponse);
248 ASSERT(!m_buffer); 248 DCHECK(!m_buffer);
249 ASSERT(m_internalResponse->m_type == DefaultType); 249 DCHECK(m_internalResponse->m_type == DefaultType);
tkent 2017/04/08 02:29:54 Use DCHECK_EQ if it doesn't cause a build failure.
250 newResponse->m_internalResponse = m_internalResponse->clone(scriptState); 250 newResponse->m_internalResponse = m_internalResponse->clone(scriptState);
251 break; 251 break;
252 } 252 }
253 return newResponse; 253 return newResponse;
254 } 254 }
255 255
256 void FetchResponseData::populateWebServiceWorkerResponse( 256 void FetchResponseData::populateWebServiceWorkerResponse(
257 WebServiceWorkerResponse& response) { 257 WebServiceWorkerResponse& response) {
258 if (m_internalResponse) { 258 if (m_internalResponse) {
259 m_internalResponse->populateWebServiceWorkerResponse(response); 259 m_internalResponse->populateWebServiceWorkerResponse(response);
(...skipping 20 matching lines...) Expand all
280 unsigned short status, 280 unsigned short status,
281 AtomicString statusMessage) 281 AtomicString statusMessage)
282 : m_type(type), 282 : m_type(type),
283 m_status(status), 283 m_status(status),
284 m_statusMessage(statusMessage), 284 m_statusMessage(statusMessage),
285 m_headerList(FetchHeaderList::create()), 285 m_headerList(FetchHeaderList::create()),
286 m_responseTime(0) {} 286 m_responseTime(0) {}
287 287
288 void FetchResponseData::replaceBodyStreamBuffer(BodyStreamBuffer* buffer) { 288 void FetchResponseData::replaceBodyStreamBuffer(BodyStreamBuffer* buffer) {
289 if (m_type == BasicType || m_type == CORSType) { 289 if (m_type == BasicType || m_type == CORSType) {
290 ASSERT(m_internalResponse); 290 DCHECK(m_internalResponse);
291 m_internalResponse->m_buffer = buffer; 291 m_internalResponse->m_buffer = buffer;
292 m_buffer = buffer; 292 m_buffer = buffer;
293 } else if (m_type == DefaultType) { 293 } else if (m_type == DefaultType) {
294 ASSERT(!m_internalResponse); 294 DCHECK(!m_internalResponse);
295 m_buffer = buffer; 295 m_buffer = buffer;
296 } 296 }
297 } 297 }
298 298
299 DEFINE_TRACE(FetchResponseData) { 299 DEFINE_TRACE(FetchResponseData) {
300 visitor->trace(m_headerList); 300 visitor->trace(m_headerList);
301 visitor->trace(m_internalResponse); 301 visitor->trace(m_internalResponse);
302 visitor->trace(m_buffer); 302 visitor->trace(m_buffer);
303 } 303 }
304 304
305 } // namespace blink 305 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698