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

Side by Side Diff: Source/core/loader/ResourceLoader.cpp

Issue 16950017: Reland [Resource Timing] Expose redirect timing information (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 6 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, 2007, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
3 * (C) 2007 Graham Dennis (graham.dennis@gmail.com) 3 * (C) 2007 Graham Dennis (graham.dennis@gmail.com)
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 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 ASSERT(!request.isNull()); 270 ASSERT(!request.isNull());
271 if (!redirectResponse.isNull()) { 271 if (!redirectResponse.isNull()) {
272 if (!m_documentLoader->cachedResourceLoader()->canRequest(m_resource->ty pe(), request.url(), m_options.contentSecurityPolicyOption)) { 272 if (!m_documentLoader->cachedResourceLoader()->canRequest(m_resource->ty pe(), request.url(), m_options.contentSecurityPolicyOption)) {
273 cancel(); 273 cancel();
274 return; 274 return;
275 } 275 }
276 if (m_resource->type() == CachedResource::ImageResource && m_documentLoa der->cachedResourceLoader()->shouldDeferImageLoad(request.url())) { 276 if (m_resource->type() == CachedResource::ImageResource && m_documentLoa der->cachedResourceLoader()->shouldDeferImageLoad(request.url())) {
277 cancel(); 277 cancel();
278 return; 278 return;
279 } 279 }
280 m_documentLoader->cachedResourceLoader()->redirectReceived(m_resource, r edirectResponse);
280 m_resource->willSendRequest(request, redirectResponse); 281 m_resource->willSendRequest(request, redirectResponse);
281 } 282 }
282 283
283 if (request.isNull() || m_state == Terminated) 284 if (request.isNull() || m_state == Terminated)
284 return; 285 return;
285 286
286 if (m_options.sendLoadCallbacks == SendCallbacks) 287 if (m_options.sendLoadCallbacks == SendCallbacks)
287 frameLoader()->notifier()->dispatchWillSendRequest(m_documentLoader.get( ), m_resource->identifier(), request, redirectResponse, m_options.initiatorInfo) ; 288 frameLoader()->notifier()->dispatchWillSendRequest(m_documentLoader.get( ), m_resource->identifier(), request, redirectResponse, m_options.initiatorInfo) ;
288 else 289 else
289 InspectorInstrumentation::willSendRequest(m_frame.get(), m_resource->ide ntifier(), m_documentLoader.get(), request, redirectResponse, m_options.initiato rInfo); 290 InspectorInstrumentation::willSendRequest(m_frame.get(), m_resource->ide ntifier(), m_documentLoader.get(), request, redirectResponse, m_options.initiato rInfo);
290 291
292 request.setReportLoadTiming(true);
293
291 m_request = request; 294 m_request = request;
292 295
293 if (request.isNull()) 296 if (request.isNull())
294 cancel(); 297 cancel();
295 } 298 }
296 299
297 void ResourceLoader::didReceiveCachedMetadata(ResourceHandle*, const char* data, int length) 300 void ResourceLoader::didReceiveCachedMetadata(ResourceHandle*, const char* data, int length)
298 { 301 {
299 ASSERT(m_state == Initialized); 302 ASSERT(m_state == Initialized);
300 m_resource->setSerializedCachedMetadata(data, length); 303 m_resource->setSerializedCachedMetadata(data, length);
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 info.addMember(m_request, "request"); 424 info.addMember(m_request, "request");
422 info.addMember(m_originalRequest, "originalRequest"); 425 info.addMember(m_originalRequest, "originalRequest");
423 info.addMember(m_deferredRequest, "deferredRequest"); 426 info.addMember(m_deferredRequest, "deferredRequest");
424 info.addMember(m_options, "options"); 427 info.addMember(m_options, "options");
425 info.addMember(m_resource, "resource"); 428 info.addMember(m_resource, "resource");
426 info.addMember(m_documentLoader, "documentLoader"); 429 info.addMember(m_documentLoader, "documentLoader");
427 info.addMember(m_requestCountTracker, "requestCountTracker"); 430 info.addMember(m_requestCountTracker, "requestCountTracker");
428 } 431 }
429 432
430 } 433 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698