| 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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 // Reference the object in this method since the additional processing can d
o | 315 // Reference the object in this method since the additional processing can d
o |
| 316 // anything including removing the last reference to this object. | 316 // anything including removing the last reference to this object. |
| 317 RefPtr<ResourceLoader> protect(this); | 317 RefPtr<ResourceLoader> protect(this); |
| 318 m_resource->responseReceived(response); | 318 m_resource->responseReceived(response); |
| 319 if (m_state == Terminated) | 319 if (m_state == Terminated) |
| 320 return; | 320 return; |
| 321 | 321 |
| 322 if (m_options.sendLoadCallbacks == SendCallbacks) | 322 if (m_options.sendLoadCallbacks == SendCallbacks) |
| 323 frameLoader()->notifier()->dispatchDidReceiveResponse(m_documentLoader.g
et(), m_resource->identifier(), response); | 323 frameLoader()->notifier()->dispatchDidReceiveResponse(m_documentLoader.g
et(), m_resource->identifier(), response); |
| 324 | 324 |
| 325 // FIXME: Main resources have a different set of rules for multipart than im
ages do. | 325 if (response.isMultipart()) { |
| 326 // Hopefully we can merge those 2 paths. | |
| 327 if (response.isMultipart() && m_resource->type() != CachedResource::MainReso
urce) { | |
| 328 m_loadingMultipartContent = true; | 326 m_loadingMultipartContent = true; |
| 329 | 327 |
| 330 // We don't count multiParts in a CachedResourceLoader's request count | 328 // We don't count multiParts in a CachedResourceLoader's request count |
| 331 m_requestCountTracker.clear(); | 329 m_requestCountTracker.clear(); |
| 332 if (!m_resource->isImage()) { | 330 if (!m_resource->isImage()) { |
| 333 cancel(); | 331 cancel(); |
| 334 return; | 332 return; |
| 335 } | 333 } |
| 336 } else if (m_loadingMultipartContent) { | 334 } else if (m_loadingMultipartContent) { |
| 337 // Since a subresource loader does not load multipart sections progressi
vely, data was delivered to the loader all at once. | 335 // Since a subresource loader does not load multipart sections progressi
vely, data was delivered to the loader all at once. |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 423 info.addMember(m_request, "request"); | 421 info.addMember(m_request, "request"); |
| 424 info.addMember(m_originalRequest, "originalRequest"); | 422 info.addMember(m_originalRequest, "originalRequest"); |
| 425 info.addMember(m_deferredRequest, "deferredRequest"); | 423 info.addMember(m_deferredRequest, "deferredRequest"); |
| 426 info.addMember(m_options, "options"); | 424 info.addMember(m_options, "options"); |
| 427 info.addMember(m_resource, "resource"); | 425 info.addMember(m_resource, "resource"); |
| 428 info.addMember(m_documentLoader, "documentLoader"); | 426 info.addMember(m_documentLoader, "documentLoader"); |
| 429 info.addMember(m_requestCountTracker, "requestCountTracker"); | 427 info.addMember(m_requestCountTracker, "requestCountTracker"); |
| 430 } | 428 } |
| 431 | 429 |
| 432 } | 430 } |
| OLD | NEW |