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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 m_identifier = m_frame->page()->progress()->createUniqueIdentifier(); | 245 m_identifier = m_frame->page()->progress()->createUniqueIdentifier(); |
246 createdResourceIdentifier = true; | 246 createdResourceIdentifier = true; |
247 } | 247 } |
248 | 248 |
249 if (m_options.sendLoadCallbacks == SendCallbacks) { | 249 if (m_options.sendLoadCallbacks == SendCallbacks) { |
250 if (createdResourceIdentifier) | 250 if (createdResourceIdentifier) |
251 frameLoader()->notifier()->assignIdentifierToInitialRequest(m_identi
fier, documentLoader(), request); | 251 frameLoader()->notifier()->assignIdentifierToInitialRequest(m_identi
fier, documentLoader(), request); |
252 | 252 |
253 frameLoader()->notifier()->willSendRequest(this, request, redirectRespon
se); | 253 frameLoader()->notifier()->willSendRequest(this, request, redirectRespon
se); |
254 } | 254 } |
255 #if ENABLE(INSPECTOR) | |
256 else | 255 else |
257 InspectorInstrumentation::willSendRequest(m_frame.get(), m_identifier, m
_frame->loader()->documentLoader(), request, redirectResponse); | 256 InspectorInstrumentation::willSendRequest(m_frame.get(), m_identifier, m
_frame->loader()->documentLoader(), request, redirectResponse); |
258 #endif | |
259 | 257 |
260 if (!redirectResponse.isNull()) { | 258 if (!redirectResponse.isNull()) { |
261 #if USE(PLATFORM_STRATEGIES) | 259 #if USE(PLATFORM_STRATEGIES) |
262 platformStrategies()->loaderStrategy()->resourceLoadScheduler()->crossOr
iginRedirectReceived(this, request.url()); | 260 platformStrategies()->loaderStrategy()->resourceLoadScheduler()->crossOr
iginRedirectReceived(this, request.url()); |
263 #else | 261 #else |
264 resourceLoadScheduler()->crossOriginRedirectReceived(this, request.url()
); | 262 resourceLoadScheduler()->crossOriginRedirectReceived(this, request.url()
); |
265 #endif | 263 #endif |
266 } | 264 } |
267 m_request = request; | 265 m_request = request; |
268 | 266 |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
578 info.addMember(m_frame, "frame"); | 576 info.addMember(m_frame, "frame"); |
579 info.addMember(m_documentLoader, "documentLoader"); | 577 info.addMember(m_documentLoader, "documentLoader"); |
580 info.addMember(m_request, "request"); | 578 info.addMember(m_request, "request"); |
581 info.addMember(m_originalRequest, "originalRequest"); | 579 info.addMember(m_originalRequest, "originalRequest"); |
582 info.addMember(m_resourceData, "resourceData"); | 580 info.addMember(m_resourceData, "resourceData"); |
583 info.addMember(m_deferredRequest, "deferredRequest"); | 581 info.addMember(m_deferredRequest, "deferredRequest"); |
584 info.addMember(m_options, "options"); | 582 info.addMember(m_options, "options"); |
585 } | 583 } |
586 | 584 |
587 } | 585 } |
OLD | NEW |