| 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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 ASSERT(!request.isNull()); | 275 ASSERT(!request.isNull()); |
| 276 if (!redirectResponse.isNull()) { | 276 if (!redirectResponse.isNull()) { |
| 277 if (!m_documentLoader->cachedResourceLoader()->canRequest(m_resource->ty
pe(), request.url(), m_options.contentSecurityPolicyOption)) { | 277 if (!m_documentLoader->cachedResourceLoader()->canRequest(m_resource->ty
pe(), request.url(), m_options.contentSecurityPolicyOption)) { |
| 278 cancel(); | 278 cancel(); |
| 279 return; | 279 return; |
| 280 } | 280 } |
| 281 if (m_resource->type() == CachedResource::ImageResource && m_documentLoa
der->cachedResourceLoader()->shouldDeferImageLoad(request.url())) { | 281 if (m_resource->type() == CachedResource::ImageResource && m_documentLoa
der->cachedResourceLoader()->shouldDeferImageLoad(request.url())) { |
| 282 cancel(); | 282 cancel(); |
| 283 return; | 283 return; |
| 284 } | 284 } |
| 285 m_documentLoader->cachedResourceLoader()->redirectReceived(m_resource, r
edirectResponse); |
| 285 m_resource->willSendRequest(request, redirectResponse); | 286 m_resource->willSendRequest(request, redirectResponse); |
| 286 } | 287 } |
| 287 | 288 |
| 288 if (request.isNull() || m_state == Terminated) | 289 if (request.isNull() || m_state == Terminated) |
| 289 return; | 290 return; |
| 290 | 291 |
| 291 if (m_options.sendLoadCallbacks == SendCallbacks) | 292 if (m_options.sendLoadCallbacks == SendCallbacks) |
| 292 frameLoader()->notifier()->dispatchWillSendRequest(m_documentLoader.get(
), m_identifier, request, redirectResponse); | 293 frameLoader()->notifier()->dispatchWillSendRequest(m_documentLoader.get(
), m_identifier, request, redirectResponse); |
| 293 else | 294 else |
| 294 InspectorInstrumentation::willSendRequest(m_frame.get(), m_identifier, m
_documentLoader.get(), request, redirectResponse); | 295 InspectorInstrumentation::willSendRequest(m_frame.get(), m_identifier, m
_documentLoader.get(), request, redirectResponse); |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 info.addMember(m_request, "request"); | 429 info.addMember(m_request, "request"); |
| 429 info.addMember(m_originalRequest, "originalRequest"); | 430 info.addMember(m_originalRequest, "originalRequest"); |
| 430 info.addMember(m_deferredRequest, "deferredRequest"); | 431 info.addMember(m_deferredRequest, "deferredRequest"); |
| 431 info.addMember(m_options, "options"); | 432 info.addMember(m_options, "options"); |
| 432 info.addMember(m_resource, "resource"); | 433 info.addMember(m_resource, "resource"); |
| 433 info.addMember(m_documentLoader, "documentLoader"); | 434 info.addMember(m_documentLoader, "documentLoader"); |
| 434 info.addMember(m_requestCountTracker, "requestCountTracker"); | 435 info.addMember(m_requestCountTracker, "requestCountTracker"); |
| 435 } | 436 } |
| 436 | 437 |
| 437 } | 438 } |
| OLD | NEW |