OLD | NEW |
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 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 if (!redirectResponse.isNull()) { | 360 if (!redirectResponse.isNull()) { |
361 if (!m_documentLoader->cachedResourceLoader()->canRequest(m_resource->ty
pe(), request.url())) { | 361 if (!m_documentLoader->cachedResourceLoader()->canRequest(m_resource->ty
pe(), request.url())) { |
362 cancel(); | 362 cancel(); |
363 return; | 363 return; |
364 } | 364 } |
365 if (m_resource->type() == CachedResource::ImageResource && m_documentLoa
der->cachedResourceLoader()->shouldDeferImageLoad(request.url())) { | 365 if (m_resource->type() == CachedResource::ImageResource && m_documentLoa
der->cachedResourceLoader()->shouldDeferImageLoad(request.url())) { |
366 cancel(); | 366 cancel(); |
367 return; | 367 return; |
368 } | 368 } |
369 m_resource->willSendRequest(request, redirectResponse); | 369 m_resource->willSendRequest(request, redirectResponse); |
| 370 m_documentLoader->cachedResourceLoader()->redirectReceived(m_resource, r
edirectResponse); |
370 } | 371 } |
371 | 372 |
372 if (request.isNull() || reachedTerminalState()) | 373 if (request.isNull() || reachedTerminalState()) |
373 return; | 374 return; |
374 | 375 |
375 // We need a resource identifier for all requests, even if FrameLoader is ne
ver going to see it (such as with CORS preflight requests). | 376 // We need a resource identifier for all requests, even if FrameLoader is ne
ver going to see it (such as with CORS preflight requests). |
376 bool createdResourceIdentifier = false; | 377 bool createdResourceIdentifier = false; |
377 if (!m_identifier) { | 378 if (!m_identifier) { |
378 m_identifier = m_frame->page()->progress()->createUniqueIdentifier(); | 379 m_identifier = m_frame->page()->progress()->createUniqueIdentifier(); |
379 createdResourceIdentifier = true; | 380 createdResourceIdentifier = true; |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
600 info.addMember(m_originalRequest, "originalRequest"); | 601 info.addMember(m_originalRequest, "originalRequest"); |
601 info.addMember(m_resourceData, "resourceData"); | 602 info.addMember(m_resourceData, "resourceData"); |
602 info.addMember(m_deferredRequest, "deferredRequest"); | 603 info.addMember(m_deferredRequest, "deferredRequest"); |
603 info.addMember(m_options, "options"); | 604 info.addMember(m_options, "options"); |
604 info.addMember(m_resource, "resource"); | 605 info.addMember(m_resource, "resource"); |
605 info.addMember(m_documentLoader, "documentLoader"); | 606 info.addMember(m_documentLoader, "documentLoader"); |
606 info.addMember(m_requestCountTracker, "requestCountTracker"); | 607 info.addMember(m_requestCountTracker, "requestCountTracker"); |
607 } | 608 } |
608 | 609 |
609 } | 610 } |
OLD | NEW |